From 305fb79f24233b261b5372168f76520f84d2ea87 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 16 Jun 2000 16:45:48 +0200 Subject: [PATCH 1/1] release: 1.3.60 =========== * Removed String_identifier, and use the type system of GUILE instead. * Fixed \key PITCH MODALITY syntax. The modality argument is now mandatory, a rule in convert-mudela has been added. * Cleaned up buildscripts/ directory: removed obsolete scripts. * Use Scheme_hash_table for identifier Scopes. Scheme_hash_table is based on STL and should be faster than hash_table. 1.3.59.j --- CHANGES | 24 +- Documentation/ntweb/angels.ly | 2 +- Documentation/user/glossary.tely | 46 +- Documentation/user/refman.itely | 6 +- Documentation/user/tutorial.itely | 4 +- VERSION | 4 +- buildscripts/clean-diaper.sh | 24 - buildscripts/find-typenames.pl | 20 - buildscripts/gen-sitemap.sh | 6 - buildscripts/genheader.py | 173 -- buildscripts/lilypond.sh | 18 - buildscripts/localpackage.py | 16 - buildscripts/ltmain.sh | 2453 ----------------- buildscripts/mail-address.sh | 8 - buildscripts/profile-conf.sh | 2 - buildscripts/ps-to-gifs.sh | 90 - buildscripts/run-lilypond.sh | 9 - buildscripts/set-lily.sh | 111 - buildscripts/show-current.sh | 9 - input/bugs/addlyrics.ly | 2 +- input/bugs/knee.ly | 2 +- input/denneboom.ly | 2 +- input/example-3.ly | 2 +- input/just-friends.ly | 2 +- input/praeludium-fuga-E.ly | 6 +- input/rhythm.ly | 2 +- input/star-spangled-banner.ly | 4 +- input/test/banter-chords.ly | 2 +- input/test/bar-scripts.ly | 2 +- input/test/beam-chord.ly | 2 +- input/test/beam-cross-staff.ly | 2 +- input/test/beam-isknee.ly | 2 +- input/test/beams.ly | 2 +- input/test/breathing-sign.ly | 4 +- input/test/broken.ly | 2 +- input/test/chord-inversion.ly | 2 +- input/test/chord-table.ly | 2 +- input/test/chords.ly | 32 +- input/test/clefs.ly | 2 +- input/test/collisions.ly | 2 +- input/test/defaultbars.ly | 2 +- input/test/extender.ly | 2 +- input/test/extra-staff.ly | 2 +- input/test/font-body.ly | 10 +- input/test/font.ly | 2 +- input/test/font16.ly | 2 +- input/test/font20.ly | 2 +- input/test/gmsusd.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 2 +- input/test/hyphen.ly | 2 +- input/test/incipit.ly | 4 +- input/test/keys.ly | 12 +- input/test/keys2.ly | 2 +- input/test/knee-mult.ly | 2 +- input/test/knee.ly | 2 +- input/test/lyric-combine.ly | 2 +- input/test/lyrics.ly | 2 +- input/test/mark.ly | 2 +- input/test/memory.ly | 2 +- input/test/multi-measure-rest.ly | 3 +- input/test/multi-rest.ly | 2 +- input/test/noteheadstyle.ly | 2 +- input/test/notemode-chords.ly | 2 +- input/test/orchestscore.ly | 2 +- input/test/ossia.ly | 2 +- input/test/rest-collision.ly | 2 +- input/test/scripts.ly | 2 +- input/test/sleur.ly | 2 +- input/test/slur-cross-staff.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slur-dash.ly | 2 +- input/test/slurs.ly | 2 +- input/test/spacing-2.ly | 6 +- input/test/spacing.ly | 2 +- input/test/span-bars.ly | 2 +- input/test/staff-margin-partial.ly | 2 +- input/test/staff-margin.ly | 2 +- input/test/staff-side-slur.ly | 2 +- input/test/staff-size.ly | 4 +- input/test/stem-tremolo.ly | 2 +- input/test/stem.ly | 2 +- input/test/tchaikovsky.ly | 6 +- input/test/thumb.ly | 2 +- input/test/title.ly | 2 +- input/test/transposition.ly | 8 +- input/test/tup.ly | 2 +- input/test/tuplet.ly | 2 +- input/test/twinkle-as5.ly | 2 +- input/test/updown.ly | 2 +- input/test/vertical-align.ly | 2 +- input/test/vertical-text.ly | 2 +- input/twinkle-pop.ly | 2 +- input/twinkle.ly | 2 +- lily/command-request.cc | 58 +- lily/identifier.cc | 5 +- lily/include/command-request.hh | 13 +- lily/include/identifier.hh | 3 - lily/include/key-def.hh | 2 - lily/include/moment.hh | 3 +- lily/include/my-lily-lexer.hh | 5 +- lily/include/newkey-def.hh | 36 - lily/include/scope.hh | 20 +- lily/key-engraver.cc | 5 +- lily/key-performer.cc | 2 +- lily/lexer.ll | 30 +- lily/lily-guile.cc | 6 +- lily/line-of-score.cc | 4 - lily/local-key-engraver.cc | 36 +- lily/main.cc | 6 + lily/music-output-def.cc | 7 +- lily/my-lily-lexer.cc | 19 +- lily/newkey-def.cc | 51 - lily/paper-outputter.cc | 14 +- lily/parser.yy | 88 +- lily/scope.cc | 19 + lily/score-element.cc | 7 +- ly/book-fragment.ly | 2 +- ly/book-init.ly | 2 +- ly/catalan.ly | 2 +- ly/center-fragment.ly | 2 +- ly/center.ly | 2 +- ly/declarations-as.ly | 17 +- ly/declarations.ly | 12 +- ly/deutsch.ly | 2 +- ly/english.ly | 2 +- ly/fragment.ly | 2 +- ly/init-as.ly | 2 +- ly/init.ly | 2 +- ly/italiano.ly | 2 +- ly/key.ly | 1 + ly/norsk.ly | 2 +- ly/paper-as5.ly | 2 +- ly/paper-as9.ly | 2 +- ly/paper16.ly | 2 +- ly/paper20.ly | 2 +- ly/paper23.ly | 2 +- ly/property.ly | 2 +- ly/scales.ly | 32 + ly/svenska.ly | 2 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mutopia/Coriolan/bassi-part.ly | 2 +- mutopia/Coriolan/clarinetti-part.ly | 2 +- mutopia/Coriolan/clarinetti.ly | 4 +- mutopia/Coriolan/clarinetto-1.ly | 2 +- mutopia/Coriolan/clarinetto-2.ly | 2 +- mutopia/Coriolan/contrabasso-part.ly | 2 +- mutopia/Coriolan/contrabasso.ly | 2 +- mutopia/Coriolan/coriolan.ly | 2 +- mutopia/Coriolan/corni-part.ly | 2 +- mutopia/Coriolan/corni.ly | 2 +- mutopia/Coriolan/corno-1.ly | 2 +- mutopia/Coriolan/corno-2.ly | 2 +- mutopia/Coriolan/fagotti-part.ly | 2 +- mutopia/Coriolan/fagotti.ly | 2 +- mutopia/Coriolan/fagotto-1.ly | 2 +- mutopia/Coriolan/fagotto-2.ly | 2 +- mutopia/Coriolan/flauti-part.ly | 2 +- mutopia/Coriolan/flauti.ly | 2 +- mutopia/Coriolan/flauto-1.ly | 2 +- mutopia/Coriolan/flauto-2.ly | 2 +- mutopia/Coriolan/global.ly | 4 +- mutopia/Coriolan/oboe-1.ly | 2 +- mutopia/Coriolan/oboe-2.ly | 2 +- mutopia/Coriolan/oboi-part.ly | 2 +- mutopia/Coriolan/oboi.ly | 2 +- mutopia/Coriolan/timpani-part.ly | 2 +- mutopia/Coriolan/timpani.ly | 2 +- mutopia/Coriolan/trombe-part.ly | 2 +- mutopia/Coriolan/trombe.ly | 2 +- mutopia/Coriolan/trombo-1.ly | 2 +- mutopia/Coriolan/trombo-2.ly | 2 +- mutopia/Coriolan/viola-1.ly | 2 +- mutopia/Coriolan/viola-2.ly | 2 +- mutopia/Coriolan/viola-part.ly | 2 +- mutopia/Coriolan/violino-1-part.ly | 2 +- mutopia/Coriolan/violino-1.ly | 2 +- mutopia/Coriolan/violino-2-part.ly | 2 +- mutopia/Coriolan/violino-2.ly | 2 +- mutopia/Coriolan/violoncello-part.ly | 2 +- mutopia/Coriolan/violoncello.ly | 2 +- mutopia/D.Zipoli/verso_2.ly | 2 +- mutopia/E.Satie/gnossienne-4.ly | 2 +- mutopia/E.Satie/petite-ouverture-a-danser.ly | 2 +- mutopia/F.Schubert/standchen-16.ly | 2 +- mutopia/F.Schubert/standchen-20.ly | 2 +- mutopia/F.Schubert/standchen.ly | 4 +- mutopia/Hymns/diademata.ly | 4 +- mutopia/Hymns/laudatedom.ly | 4 +- mutopia/Hymns/maccabaeus.ly | 4 +- mutopia/Hymns/ode.ly | 4 +- mutopia/Hymns/stille.ly | 4 +- .../Cembalo-Partitas/Partita_II_Allemande.ly | 4 +- .../Cembalo-Partitas/Partita_II_Capriccio.ly | 4 +- .../Cembalo-Partitas/Partita_II_Sinfonia.ly | 4 +- mutopia/J.S.Bach/Duette/global-i.ly | 4 +- mutopia/J.S.Bach/Duette/global-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-i.ly | 2 +- mutopia/J.S.Bach/Duette/viola-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-i.ly | 2 +- mutopia/J.S.Bach/Duette/violino-ii.ly | 4 +- mutopia/J.S.Bach/Duette/violino-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-viola.ly | 2 +- .../J.S.Bach/Duette/violino-violoncello.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-i.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-ii.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-part.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-3.ly | 4 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 4 +- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 4 +- .../Solo-Cello-Suites/allemande-cello.ly | 4 +- .../Solo-Cello-Suites/allemande-urtext.ly | 2 +- .../Solo-Cello-Suites/allemande-viola.ly | 4 +- .../Solo-Cello-Suites/courante-cello.ly | 4 +- .../Solo-Cello-Suites/courante-urtext.ly | 2 +- .../Solo-Cello-Suites/courante-viola.ly | 4 +- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 4 +- .../Solo-Cello-Suites/gigue-urtext.ly | 2 +- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 4 +- .../Solo-Cello-Suites/menuetto-cello.ly | 6 +- .../Solo-Cello-Suites/menuetto-urtext.ly | 2 +- .../Solo-Cello-Suites/menuetto-viola.ly | 6 +- .../Solo-Cello-Suites/prelude-cello.ly | 4 +- .../Solo-Cello-Suites/prelude-urtext.ly | 2 +- .../Solo-Cello-Suites/prelude-viola.ly | 4 +- .../Solo-Cello-Suites/sarabande-cello.ly | 4 +- .../Solo-Cello-Suites/sarabande-urtext.ly | 2 +- .../Solo-Cello-Suites/sarabande-viola.ly | 4 +- mutopia/J.S.Bach/wtk1-fugue1.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue2.ly | 8 +- mutopia/J.S.Bach/wtk1-prelude1.ly | 2 +- mutopia/gallina.ly | 50 +- scm/lily.scm | 3 +- scripts/convert-mudela.py | 7 + 239 files changed, 580 insertions(+), 3535 deletions(-) delete mode 100755 buildscripts/clean-diaper.sh delete mode 100755 buildscripts/find-typenames.pl delete mode 100755 buildscripts/gen-sitemap.sh delete mode 100755 buildscripts/genheader.py delete mode 100755 buildscripts/lilypond.sh delete mode 100755 buildscripts/localpackage.py delete mode 100755 buildscripts/ltmain.sh delete mode 100755 buildscripts/mail-address.sh delete mode 100755 buildscripts/profile-conf.sh delete mode 100755 buildscripts/ps-to-gifs.sh delete mode 100755 buildscripts/run-lilypond.sh delete mode 100755 buildscripts/set-lily.sh delete mode 100755 buildscripts/show-current.sh create mode 100644 ly/key.ly create mode 100644 ly/scales.ly diff --git a/CHANGES b/CHANGES index c66b9458b9..e721f26d8c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,19 @@ -1.3.59.uu2.jcn1 -=============== +1.3.59.hwn1 +=========== + +* Removed String_identifier, and use the type system of GUILE instead. + +* Fixed \key PITCH MODALITY syntax. The modality argument is now +mandatory, a rule in convert-mudela has been added. + +* Cleaned up buildscripts/ directory: removed obsolete scripts. + +* Use Scheme_hash_table for identifier Scopes. Scheme_hash_table is +based on STL and should be faster than hash_table. + + +1.3.59.jcn1 +=========== * Fixed scm_un/protect_object for guile-1.3.4 and 1.3.5 snapshots, in the process reduced number of protect/unprotect calls. With @@ -8,12 +22,6 @@ * Fixed make diff bug in stepmake to be able to make this diff :-) -1.3.59.hwn1 -=========== - -* Use Scheme_hash_table for identifier Scopes. Scheme_hash_table is -based on STL and should be faster than hash_table. - 1.3.58.hwn1 =========== diff --git a/Documentation/ntweb/angels.ly b/Documentation/ntweb/angels.ly index 2ea62654ff..ae7d223aa2 100644 --- a/Documentation/ntweb/angels.ly +++ b/Documentation/ntweb/angels.ly @@ -15,7 +15,7 @@ global = \notes { \clef treble; } -\version "1.3.41"; +\version "1.3.59"; % \include "paper16.ly" flute1 = \notes \relative c'' \context Voice = flute { diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 7d7d5bbe01..3e63b48eaf 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -144,7 +144,7 @@ the duration of the long a. is proportionate to that of the main note. %\property Voice.textEmptyDimension = ##t \property Voice.textStyle = "large" \notes\relative c'' { -\key d; +\key d \major; \time 4/4; r { \property Grace.stemStyle = "" @@ -165,7 +165,7 @@ An appoggiatura may have more notes preceding the main note. \emptyText \property Voice.textStyle = "large" \notes\relative c'' { - \key as; + \key as \major; \time 2/4; \grace { bes16 } as8_"notation" as16 bes as8 g | \grace { [as16 ( bes] } < ) c4 as > @@ -296,7 +296,7 @@ start of the music. @ @mudela[13pt,eps] -\key g; +\key g \major; \time 4/4; \notes\relative c'' { g4 c b a | g1 \bar "||";} \time 3/8; @@ -512,7 +512,7 @@ Melody moving in the narrow steps of the scale; @ @mudela[13pt,eps] -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { g4 g g a | b2 a | g4 b a a | g1 \bar "||"; } @end mudela @@ -546,7 +546,7 @@ composition methods. \property Score.timeSignatureStyle = "C2/2" \context GrandStaff < \notes\relative c' { - \key bes; + \key bes \major; \time 4/4; \clef treble; < \context Voice = rha { @@ -563,7 +563,7 @@ composition methods. } \notes\relative c' { \clef bass; - \key bes; + \key bes \major; < \context Voice = lha { \stemup r8 d es g, fis4 g | r8 a16 bes c8 bes16 a bes4 g | @@ -601,7 +601,7 @@ abbreviation "cresc.". @ @mudela[13pt,eps] -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { g4 \< a b c | \! d1 \bar "|."; } @end mudela @@ -633,7 +633,7 @@ frequently near the beginning marked by a sign: @mudela[13pt,eps] \property Voice.textStyle = "large" -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { d1 | g,4^\segno a b c | b a g2_"d.s." \bar "|."; } @end mudela @@ -647,7 +647,7 @@ or the abbreviation "decresc.". @ @mudela[13pt,eps] -\key g; \time 4/4; +\key g \major; \time 4/4; \notes\relative c'' { d4 \> c b a | \! g1 \bar "|."; } @end mudela @@ -860,7 +860,7 @@ scale. Opposite of @ar{}@strong{conjunct movement}. @ @mudela[13pt,eps] -\key a; +\key a \major; \time 4/4; \notes\relative c' { \partial 8; e8 | a4. gis8 b a e cis | @@ -1582,14 +1582,14 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8) or @mudela[13pt,eps] \notes\relative c'' { \time 3/4; - \key f; + \key f \major; c es d | c bes8 a bes4 | c es d | c2 \bar "||";} @end mudela @mudela[13pt,eps] \notes\relative c' { \time 6/8; - \key f; + \key f \major; f8 f f f a16 g a f | c'8 c c c e16 d e c \bar "||";} @end mudela @@ -1597,7 +1597,7 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8) or @mudela[13pt,eps] \notes\relative c'' { \time 5/4; - \key g; + \key g \major; d4 b8 g b d d c a4 | g8 g16 g g8 g16 g g8 fis16 g a8 fis16 e d4 \bar "||";} @end mudela @@ -1686,7 +1686,7 @@ subject. \property Voice.textStyle = "large" \notes\relative c'' { \time 4/4; - \key g; + \key g \major; \partial 8; g16_"------" fis | g8 d16_"------" c d8 g16 fis g8 b,16 a b8 g'16 fis | g8 g,16 a b8 cis d16 s @@ -2012,10 +2012,10 @@ the same @w{@ar{}@strong{signature}}. \property Score.barNonAuto = ##t \property Voice.textStyle = "large" \notes\relative c' { - \key es; + \key es \major; es1_"e flat major" f g as bes c d es \bar "||"; s16 - \key es; + \key es \major; c,1_"c minor" d es f g a! b! c \bar "||"; } @end mudela @@ -2027,7 +2027,7 @@ gen@-ta@-gel@-se, S: repris, N: . @ @mudela[13pt,eps] -\key g; +\key g \major; \time 4/4; \notes\relative c'' { \repeat volta 2 {g4 g d' d | e e d2 | c4 c b b | a a g2 } @@ -2239,7 +2239,7 @@ notehead. @ @mudela[13pt,eps] -\key d; +\key d \major; \time 4/4; \notes\relative c'' { \partial 8; a8 | @@ -2430,7 +2430,7 @@ with figures designating the chief @w{@ar{}@strong{interval}}s and \context GrandStaff < \notes\relative c'' { \time 4/4; - \key es; + \key es \major; \clef treble; < \context Voice = rha { \stemup @@ -2446,7 +2446,7 @@ with figures designating the chief @w{@ar{}@strong{interval}}s and \addlyrics \notes\relative c' { \clef bass; - \key es; + \key es \major; es8 c () c bes () bes as () as g16 f | es4 } \context Lyrics \lyrics { @@ -2503,10 +2503,10 @@ Shifting a melody up or down in pitch, while keeping the same relative pitches. \context Staff { \time 3/4; \notes\relative c'' { - \key g; + \key g \major; d4 g,8 a b c | d4 g, g | e' c8 d e fis | g4 g, g \bar "|."; } \transpose bes\relative c'' { - \key g; + \key g \major; d4 g,8 a b c | d4 g, g | e' c8 d e fis | g4 g, g \bar "|."; } } @end mudela @@ -2599,7 +2599,7 @@ line. @w{@ar{}@strong{measure}} @w{@ar{}@strong{meter}} @ @mudela[13pt,eps] -\key f; +\key f \major; \time 4/4; \notes\relative c' { \partial 4; f4 | bes4. a8 bes4 c | diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 6b7ac8a458..b7db980a02 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1798,10 +1798,10 @@ will print flats. @mudela[fragment,verbatim] \context Staff { \clef "F"; - { \key e; c d e f } + { \key e \major; c d e f } \clef "G"; - \transpose des'' { \key e; c d e f } - \transpose cis'' { \key e; c d e f } + \transpose des'' { \key e \major; c d e f } + \transpose cis'' { \key e \major; c d e f } } @end mudela diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 136410e948..f15f05f515 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -45,7 +45,7 @@ of the famous menuet in J. S. Bach's @emph{Klavierbuechlein}. \notes \relative c'' \sequential{ \time 3/4; - \key g; + \key g \major; \repeat "volta" 2 { d4 g,8 a b c d4 g, g | @@ -168,7 +168,7 @@ sign is printed. This command is also used to generate bar lines in the right spots. @example - \key g; + \key g \major; @end example This command changes the current key to G-major. Although this diff --git a/VERSION b/VERSION index eb96155196..eb48af3ecc 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=59 -MY_PATCH_LEVEL=uu2.jcn1 +PATCH_LEVEL=60 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/clean-diaper.sh b/buildscripts/clean-diaper.sh deleted file mode 100755 index 374629eb71..0000000000 --- a/buildscripts/clean-diaper.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# unclobber current dir. -rm -vf *.aux *.log *.orig *~ *.dvi *.dep - -# subdirs -rm -vf `grep -li "^%created by: GNU LilyPond" *.out *.tex` -rm -vf `grep -li "^% *Creator: GNU LilyPond" *.out *.tex` -rm -vf `grep -li "Creator: mi2mu" *.midi.ly` -rm -vf `grep -li "%Creator: dvipsk" *.ps` -rm -vf `grep -li "Creator: GNU LilyPond" *.midi` -rm -vf `grep -li "Creator: ly2dvi" *.tex` -rm -vf `find -name 'core'` -rm -vf `find -name '*.orig'` -rm -vf `find -name '*.rej'` -rm -vf `find -name 'feta*pk'` -rm -vf `find -name 'feta*tfm'` - - - - -# docxx mess -rm -vf *.class HIER*.html dxxgifs.tex gifs.db icon?.gif logo.gif down.gif \ - aindex.html index.html diff --git a/buildscripts/find-typenames.pl b/buildscripts/find-typenames.pl deleted file mode 100755 index 890f9cabd0..0000000000 --- a/buildscripts/find-typenames.pl +++ /dev/null @@ -1,20 +0,0 @@ -#!@PERL@ - -open GREP, "egrep -h '^struct|^class' *.hh *.cc|"; -open OUT, "|sort | uniq"; -while () { - - s/^struct/class/; - if (! /; *$/) { - s/:[^{]+{.*$//; - s/ *{.*$/;/; - } - if (! /; *$/) { - chop; - $_ .= ";\n"; - - } - print OUT; -} -close OUT; -close GREP; diff --git a/buildscripts/gen-sitemap.sh b/buildscripts/gen-sitemap.sh deleted file mode 100755 index 7f9bcbc95e..0000000000 --- a/buildscripts/gen-sitemap.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -TMPDIR=/tmp/gen-sitemap -for tarball in $*; do - tar -C $TMPDIR -xfz $tarball '*.html' -done diff --git a/buildscripts/genheader.py b/buildscripts/genheader.py deleted file mode 100755 index bfe64c9be6..0000000000 --- a/buildscripts/genheader.py +++ /dev/null @@ -1,173 +0,0 @@ -#!@PYTHON@ - -# genheader.py -- do headers (like these) -# -# source file of the GNU LilyPond music typesetter -# -# (c) 1997--1998 Han-Wen Nienhuys - -import os -import sys -import pwd -import re -import string -import getopt -import time - -class My_options: - def __init__(self): - self.commentify = None - self.add_hdr_def = 0 - self.classname = '' - -my_options = My_options() - - -def name(): - return os.environ['USERNAME'] - -# field 4 of passwd is also used for finger info (phone no., office etc) -# return pwd.getpwuid(os.getuid())[4] - -def c_commentify(str): - return '/* ' + re.sub('^',' ', str) + '\n */'; - -def sh_commentify(str): - return re.sub('^', '# ', str) - -def tex_commentify(str): - return re.sub('^', '% ', str) - -def project_str(): - cwd = os.getcwd() - if re.search('flower', cwd): - PROJECT = "the Flower Library" - elif re.search('mf$', cwd): - PROJECT = "the Feta (defintively not an abbreviation for Font-En-Tja) music font" - else: - PROJECT = "the GNU LilyPond music typesetter" - return PROJECT - -def head_str(filename): - if my_options.add_hdr_def: - what = "declare " - else: - what=" implement " - - - mailaddres = '' - try: - mailaddres = '<%s>' % os.environ['MAILADDRESS'] - except KeyError: - pass - headstr = '\n%s -- %s\n\nsource file of %s\n\n(c) %d %s %s\n' \ - %(filename, what, project_str(), - time.localtime (time.time ())[0], name(), mailaddres) - return headstr - - -def c_include(filename): - startdef= filename; - trans = string.maketrans( string.lowercase + '-.', string.uppercase + '__') - startdef = string.translate(filename, trans) - - - headstr = "\n\n#ifndef %s\n#define %s\n" % (startdef, startdef) - terminatestr = "#endif /* %s */\n" % (startdef); - - return headstr+ '\n\n'+ terminatestr; - - -def icc_include (filename): - startdef= filename; - trans = string.maketrans( string.lowercase + '-.', string.uppercase + '__') - startdef = string.translate(filename, trans) - - - headstr = "\n\n#ifndef %s\n#define %s\n" % (startdef, startdef) - headstr = headstr + r""" -#ifndef INLINE -#define INLINE inline -#define LOCAL_INLINE_DEF -#endif -""" - terminatestr = "#endif /* %s */\n" % (startdef); - - terminatestr = r""" -#ifdef LOCAL_INLINE_DEF -#undef LOCAL_INLINE_DEF -#undef INLINE -#endif -""" + terminatestr - return headstr+ '\n\n'+ terminatestr; - - - -def help (): - sys.stdout.write ("Usage: genheader [options] FILENAME\n" - + "Generate file with header FILENAME\n\n" - + "Options:\n" - + " -h, --header generate header\n" - + " --help print this help\n" - + " -p, --package=DIR specify package\n" - ) - - sys.exit (0) - - -(options, files) = getopt.getopt(sys.argv[1:], 'tcshp:', ['class', 'package=', 'help']) - -for opt in options: - o = opt[0] - a = opt[1] - if o == '-c': - my_options.commentify = c_commentify - elif o == '-t': - my_options.commentify = tex_commentify - elif o == '-s': - my_options.commentify = sh_commentify - elif o == '-h' or o == '--header': - my_options.add_hdr_def = 1 - elif o == '--class': - my_options.classname = a - elif o == '--help': - help () - -# FIXME: should create xxx.cc and include/xxx.hh, with implement/declare Xxx -# in one run -if my_options.classname: - pass - -def do_file(nm): - s = my_options.commentify(head_str(nm)) - if my_options.add_hdr_def: - s = s + c_include(nm) - return s - - -def extension(ext,nm): - ext = '\\.' + ext - return re.search(ext, nm) <> None - -def c_extension(nm): - return extension('hh',nm) or extension('cc',nm) \ - or extension('icc', nm) or extension('tcc',nm) - -def select_commentification(nm): - if c_extension (nm): - return c_commentify - elif extension('py',nm) or extension('pl',nm) or extension('sh',nm): - return sh_commentify - elif extension('mf',nm) or extension('tex',nm) or extension('ly',nm): - return tex_commentify - else: - sys.stderr.write ('unknown extension for file %s\n' % nm) - raise 'help' - -for nm in files: - if extension('hh', nm) or extension('icc', nm) or extension('tcc', nm): - my_options.add_hdr_def = 1 - if my_options.commentify == None: - my_options.commentify = select_commentification(nm) - print do_file(nm) - diff --git a/buildscripts/lilypond.sh b/buildscripts/lilypond.sh deleted file mode 100755 index e3d8e70b63..0000000000 --- a/buildscripts/lilypond.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# via scm wrapper - -foo=lilypond.$$ -trap "rm $foo" 1 2 15 -touch lilypond.$$ - -$LILYPONDPREFIX/lily/out/lilypond -f scm $* -scm=`find . -maxdepth 1 -cnewer $foo -and -name '*.scm'` -for i in $scm; do - dir=`dirname $i` - base=`basename $i .scm` - file=$dir/$base.tex - rm -f $file - guile -s $i > $file -done -rm -f $scm -rm $foo diff --git a/buildscripts/localpackage.py b/buildscripts/localpackage.py deleted file mode 100755 index f37fc8267b..0000000000 --- a/buildscripts/localpackage.py +++ /dev/null @@ -1,16 +0,0 @@ -# localpackage.py -# must be included in package's python bin dir - -def localpackage (n): - p=lower (n) - P=upper (n) - if topdir == '': - try: - topdir = os.environ[P + '_SOURCEDIR'] - except: - topdir = os.environ['HOME'] + '/usr/src/' + p - sys.path.append (topdir + '/stepmake/bin') - from packagepython import * - package = Package (topdir) - packager = Packager () - diff --git a/buildscripts/ltmain.sh b/buildscripts/ltmain.sh deleted file mode 100755 index e9350b3fab..0000000000 --- a/buildscripts/ltmain.sh +++ /dev/null @@ -1,2453 +0,0 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun ltconfig. -# -# Copyright (C) 1996-1998 Free Software Foundation, Inc. -# Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# The name of this program. -progname=`$echo "$0" | sed 's%^.*/%%'` -modename="$progname" - -# Constants. -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION=1.2 - -default_mode= -help="Try \`$progname --help' for more information." -magic="%%%MAGIC variable%%%" -mkdir="mkdir" -mv="mv -f" -rm="rm -f" - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' - -# NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LANG+set}" = set; then LANG=C; export LANG; fi - -if test "$LTCONFIG_VERSION" != "$VERSION"; then - echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 -fi - -if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - echo "$modename: not configured to build any kind of library" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= - -# Parse our command line options once, thoroughly. -while test $# -gt 0 -do - arg="$1" - shift - - case "$arg" in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case "$prev" in - execute_dlfiles) - eval "$prev=\"\$$prev \$arg\"" - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case "$arg" in - --help) - show_help=yes - ;; - - --version) - echo "$PROGRAM (GNU $PACKAGE) $VERSION" - exit 0 - ;; - - --dry-run | -n) - run=: - ;; - - --features) - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - exit 0 - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --quiet | --silent) - show=: - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 -fi - -if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then - case "$nonopt" in - *cc | *++ | gcc* | *-gcc*) - mode=link - for arg - do - case "$arg" in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case "$mode" in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - lastarg= - srcfile="$nonopt" - suppress_output= - - for arg - do - # Accept any command-line options. - case "$arg" in - -o) - $echo "$modename: you cannot specify the output filename with \`-o'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - esac - - # Accept the current argument as the source file. - lastarg="$srcfile" - srcfile="$arg" - - # Aesthetically quote the previous argument. - - # Backslashify any backslashes, double quotes, and dollar signs. - # These are the only characters that are still specially - # interpreted inside of double-quoted scrings. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly in scan - # sets, so we specify it separately. - case "$lastarg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - lastarg="\"$lastarg\"" - ;; - esac - - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - done - - # Get the name of the library object. - libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - - # Recognize several different file suffixes. - xform='[cCFSfms]' - case "$libobj" in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case "$libobj" in - *.lo) obj=`$echo "X$libobj" | $Xsed -e 's/\.lo$/.o/'` ;; - *) - $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2 - exit 1 - ;; - esac - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - $run $rm $obj $libobj - trap "$run $rm $obj $libobj; exit 1" 1 2 15 - else - $run $rm $libobj - trap "$run $rm $libobj; exit 1" 1 2 15 - fi - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - # All platforms use -DPIC, to notify preprocessed assembler code. - $show "$base_compile$pic_flag -DPIC $srcfile" - if $run eval "$base_compile\$pic_flag -DPIC \$srcfile"; then : - else - test -n "$obj" && $run $rm $obj - exit 1 - fi - - # If we have no pic_flag, then copy the object into place and finish. - if test -z "$pic_flag"; then - $show "$LN_S $obj $libobj" - $run $LN_S $obj $libobj - exit $? - fi - - # Just move the object, then go on to compile the next one - $show "$mv $obj $libobj" - $run $mv $obj $libobj || exit 1 - - # Allow error messages only from the first compilation. - suppress_output=' >/dev/null 2>&1' - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - # Suppress compiler output if we already did a PIC compilation. - $show "$base_compile $srcfile$suppress_output" - if $run eval "$base_compile \$srcfile$suppress_output"; then : - else - $run $rm $obj $libobj - exit 1 - fi - fi - - # Create an invalid libtool object if no PIC, so that we do not - # accidentally link it into a program. - if test "$build_libtool_libs" != yes; then - $show "echo timestamp > $libobj" - $run eval "echo timestamp > \$libobj" || exit $? - fi - - exit 0 - ;; - - # libtool link mode - link) - modename="$modename: link" - CC="$nonopt" - allow_undefined=yes - compile_command="$CC" - finalize_command="$CC" - - compile_shlibpath= - finalize_shlibpath= - deplibs= - dlfiles= - dlprefiles= - export_dynamic=no - hardcode_libdirs= - libobjs= - link_against_libtool_libs= - ltlibs= - objs= - prev= - prevarg= - release= - rpath= - perm_rpath= - temp_rpath= - vinfo= - - # We need to know -static, to get the right output filenames. - for arg - do - case "$arg" in - -all-static | -static) - if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 - fi - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - for arg - do - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case "$prev" in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case "$prev" in - dlfiles|dlprefiles) - case "$arg" in - *.la | *.lo) ;; # We handle these cases below. - *) - dlprefiles="$dlprefiles $arg" - test "$prev" = dlfiles && dlfiles="$dlfiles $arg" - prev= - ;; - esac - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath) - rpath="$rpath $arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi - - prevarg="$arg" - - case "$arg" in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - if test "$export_dynamic" != yes; then - export_dynamic=yes - if test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - else - arg= - fi - - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - fi - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'` - case "$dir" in - /* | [A-Za-z]:\\*) - # Add the corresponding hardcode_libdir_flag, if it is not identical. - ;; - *) - $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2 - exit 1 - ;; - esac - deplibs="$deplibs $arg" - ;; - - -l*) deplibs="$deplibs $arg" ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -o) prev=output ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -static) - # If we have no pic_flag, then this is the same as -all-static. - if test -z "$pic_flag" && test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - ;; - - *.o | *.a) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A library object. - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - if test "$build_libtool_libs" = yes; then - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'` - prev= - fi - libobjs="$libobjs $arg" - ;; - - *.la) - # A libtool-controlled library. - - dlname= - libdir= - library_names= - old_library= - - # Check to see that this really is a libtool archive. - if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2 - exit 1 - fi - - # If there is no directory component, then add one. - case "$arg" in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$libdir"; then - $echo "$modename: \`$arg' contains no -rpath information" 1>&2 - exit 1 - fi - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$arg'" 1>&2 - exit 1 - fi - - # Find the relevant object directory and library name. - name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'` - dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$arg"; then - dir="$objdir" - else - dir="$dir/$objdir" - fi - - # This library was specified with -dlopen. - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - if test -z "$dlname"; then - # If there is no dlname, we need to preload. - prev=dlprefiles - else - # We should not create a dependency on this library, but we - # may need any libraries it requires. - compile_command="$compile_command$dependency_libs" - finalize_command="$finalize_command$dependency_libs" - prev= - continue - fi - fi - - # The library was specified with -dlpreopen. - if test "$prev" = dlprefiles; then - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - dlprefiles="$dlprefiles $dir/$old_library" - else - dlprefiles="$dlprefiles $dir/$linklib" - fi - prev= - fi - - if test "$build_libtool_libs" = yes && test -n "$library_names"; then - link_against_libtool_libs="$link_against_libtool_libs $arg" - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi - - # This is the magic to use -rpath. - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - # Put the magic libdir with the hardcode flag. - hardcode_libdirs="$libdir" - libdir="@HARDCODE_LIBDIRS@" - else - # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - libdir= - fi - fi - - if test -n "$libdir"; then - eval flag=\"$hardcode_libdir_flag_spec\" - - compile_command="$compile_command $flag" - finalize_command="$finalize_command $flag" - fi - elif test -n "$runpath_var"; then - # Do the same for the permanent run path. - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - - - case "$hardcode_action" in - immediate) - if test "$hardcode_direct" = no; then - compile_command="$compile_command $dir/$linklib" - elif test "$hardcode_minus_L" = no; then - compile_command="$compile_command -L$dir -l$name" - elif test "$hardcode_shlibpath_var" = no; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" - fi - ;; - - relink) - # We need an absolute path. - case "$dir" in - /* | [A-Za-z]:\\*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 - fi - dir="$absdir" - ;; - esac - - if test "$hardcode_direct" = yes; then - compile_command="$compile_command $dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - compile_command="$compile_command -L$dir -l$name" - elif test "$hardcode_shlibpath_var" = yes; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" - fi - ;; - - *) - $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2 - exit 1 - ;; - esac - - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - finalize_command="$finalize_command $libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - finalize_command="$finalize_command -L$libdir -l$name" - elif test "$hardcode_shlibpath_var" = yes; then - finalize_shlibpath="$finalize_shlibpath$libdir:" - finalize_command="$finalize_command -l$name" - else - # We cannot seem to hardcode it, guess we'll fake it. - finalize_command="$finalize_command -L$libdir -l$name" - fi - else - # Transform directly to old archives if we don't build new libraries. - if test -n "$pic_flag" && test -z "$old_library"; then - $echo "$modename: cannot find static library for \`$arg'" 1>&2 - exit 1 - fi - - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_command="$compile_command $dir/$linklib" - finalize_command="$finalize_command $dir/$linklib" - else - compile_command="$compile_command -L$dir -l$name" - finalize_command="$finalize_command -L$dir -l$name" - fi - fi - - # Add in any libraries that this one depends upon. - compile_command="$compile_command$dependency_libs" - finalize_command="$finalize_command$dependency_libs" - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - ;; - esac - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -n "$vinfo" && test -n "$release"; then - $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - oldlib= - oldobjs= - case "$output" in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - - */* | *\\*) - $echo "$modename: output file \`$output' must have no directory components" 1>&2 - exit 1 - ;; - - *.a) - # Now set the variables for building old libraries. - build_libtool_libs=no - build_old_libs=yes - oldlib="$output" - $show "$rm $oldlib" - $run $rm $oldlib - ;; - - *.la) - # Make sure we only generate libraries of the form `libNAME.la'. - case "$output" in - lib*) ;; - *) - $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - - name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval libname=\"$libname_spec\" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - current=0 - revision=0 - age=0 - - if test -n "$objs"; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1 - exit 1 - fi - - # How the heck are we supposed to write a wrapper for a shared library? - if test -n "$link_against_libtool_libs"; then - $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2 - exit 1 - fi - - if test -n "$dlfiles$dlprefiles"; then - $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2 - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -z "$rpath"; then - $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - set dummy $rpath - if test $# -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - # Parse the version information argument. - IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' - set dummy $vinfo - IFS="$save_ifs" - - if test -n "$5"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - test -n "$2" && current="$2" - test -n "$3" && revision="$3" - test -n "$4" && age="$4" - - # Check that each of the things are valid numbers. - case "$current" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case "$revision" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case "$age" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - if test $age -gt $current; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - fi - - # Calculate the version variables. - version_vars="version_type current age revision" - case "$version_type" in - none) ;; - - linux) - version_vars="$version_vars major versuffix" - major=`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - version_vars="$version_vars versuffix verstring" - major=`expr $current - $age` - versuffix="$current.$age.$revision" - verstring="$versuffix" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test $loop != 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - version_vars="$version_vars major versuffix" - major="$current" - versuffix="$current.$revision" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 - ;; - esac - - # Create the output directory, or remove our outputs if we need to. - if test -d $objdir; then - $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*" - $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.* - else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : - else - exit $status - fi - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - # Add libc to deplibs on all systems. - dependency_libs="$deplibs" - deplibs="$deplibs -lc" - - if test "$build_libtool_libs" = yes; then - # Get the real and link names of the library. - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - lib="$objdir/$realname" - for link - do - linknames="$linknames $link" - done - - # Use standard objects if they are PIC. - test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` - - # Do each of the archive commands. - eval cmds=\"$archive_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Create links to the real library. - for linkname in $linknames; do - $show "(cd $objdir && $LN_S $realname $linkname)" - $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $? - done - - # If -export-dynamic was specified, set the dlname. - if test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - - # Now set the variables for building old libraries. - oldlib="$objdir/$libname.a" - ;; - - *.lo | *.o) - if test -n "$link_against_libtool_libs"; then - $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2 - exit 1 - fi - - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles"; then - $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2 - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 - fi - - case "$output" in - *.lo) - if test -n "$objs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit 1 - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e 's/\.lo$/.o/'` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $run $rm $obj $libobj - - # Create the old-style object. - reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` - - output="$obj" - eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - test -z "$libobj" && exit 0 - - if test "$build_libtool_libs" != yes; then - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - $show "echo timestamp > $libobj" - $run eval "echo timestamp > $libobj" || exit $? - exit 0 - fi - - if test -n "$pic_flag"; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs" - output="$libobj" - eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - else - # Just create a symlink. - $show "$LN_S $obj $libobj" - $run $LN_S $obj $libobj || exit 1 - fi - - exit 0 - ;; - - *) - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 - fi - - if test -n "$rpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - # Put the magic libdir with the hardcode flag. - hardcode_libdirs="$libdir" - libdir="@HARDCODE_LIBDIRS@" - else - # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - libdir= - fi - fi - - if test -n "$libdir"; then - eval flag=\"$hardcode_libdir_flag_spec\" - - compile_command="$compile_command $flag" - finalize_command="$finalize_command $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - fi - - # Substitute the hardcoded libdirs into the compile commands. - if test -n "$hardcode_libdir_separator"; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` - fi - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - finalize_command=`$echo "X$finalize_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - fi - - if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${output}S.c" - else - dlsyms= - fi - - if test -n "$dlsyms"; then - # Add our own program objects to the preloaded list. - dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - - # Discover the nlist of each of the dlfiles. - nlist="$objdir/${output}.nm" - - if test -d $objdir; then - $show "$rm $nlist ${nlist}T" - $run $rm "$nlist" "${nlist}T" - else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : - else - exit $status - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - # Parse the name list into a source file. - $show "creating $objdir/$dlsyms" - if test -z "$run"; then - # Make sure we at least have an empty file. - test -f "$nlist" || : > "$nlist" - - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - wcout=`wc "$nlist" 2>/dev/null` - count=`echo "X$wcout" | $Xsed -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` - (test "$count" -ge 0) 2>/dev/null || count=-1 - else - $rm "$nlist"T - count=-1 - fi - - case "$dlsyms" in - "") ;; - *.c) - $echo > "$objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define dld_preloaded_symbol_count some_other_symbol -#define dld_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test -f "$nlist"; then - sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms" - else - echo '/* NONE */' >> "$objdir/$dlsyms" - fi - - $echo >> "$objdir/$dlsyms" "\ - -#undef dld_preloaded_symbol_count -#undef dld_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define __ptr_t void * -#else -# define __ptr_t char * -#endif - -/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ -int dld_preloaded_symbol_count = $count; - -/* The mapping between symbol names and symbols. */ -struct { - char *name; - __ptr_t address; -} -dld_preloaded_symbols[] = -{\ -" - - if test -f "$nlist"; then - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms" - fi - - $echo >> "$objdir/$dlsyms" "\ - {0, (__ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif\ -" - ;; - - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit 1 - ;; - esac - fi - - # Now compile the dynamic symbol file. - $show "(cd $objdir && $CC -c$no_builtin_flag \"$dlsyms\")" - $run eval '(cd $objdir && $CC -c$no_builtin_flag "$dlsyms")' || exit $? - - # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` - elif test "$export_dynamic" != yes; then - test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2 - else - # We keep going just in case the user didn't refer to - # dld_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - - # We have no uninstalled library dependencies, so finalize right now. - $show "$compile_command" - $run eval "$compile_command" - exit $? - fi - - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'%g'` - finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'` - - # Create the binary in the object directory, then wrap it. - if test -d $objdir; then : - else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : - else - exit $status - fi - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case "$dir" in - /* | [A-Za-z]:\\*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi - - # Delete the old output file. - $run $rm $output - - if test -n "$compile_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command" - finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command" - fi - - case "$hardcode_action" in - relink) - # AGH! Flame the AIX and HP-UX people for me, will ya? - $echo "$modename: warning: using a buggy system linker" 1>&2 - $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2 - ;; - esac - - $show "$compile_command" - $run eval "$compile_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the finalize command for shipping. - finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"` - - # Quote $echo for shipping. - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - $rm $output - trap "$rm $output; exit 1" 1 2 15 - - $echo > $output "\ -#! /bin/sh - -# $output - temporary wrapper script for $objdir/$output -# Generated by ltmain.sh - GNU $PACKAGE $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of \``pwd`'. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='$sed_quote_subst' - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - link_against_libtool_libs='$link_against_libtool_libs' - finalize_command=\"$finalize_command\" -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" = \"$magic\"; then : - else - echo=\"$qecho\" - file=\"\$0\" - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" - - progdir=\"\$thisdir/$objdir\" - program='$output' - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\` - - export $shlibpath_var -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - - # Export the path to the program. - PATH=\"\$progdir:\$PATH\" - export PATH - - exec \$program \${1+\"\$@\"} - - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit 1 - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" - chmod +x $output - fi - exit 0 - ;; - esac - - # See if we need to build an old-fashioned archive. - if test "$build_old_libs" = "yes"; then - # Transform .lo files to .o files. - oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - eval cmds=\"$old_archive_from_new_cmds\" - else - eval cmds=\"$old_archive_cmds\" - fi - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Now create the libtool archive. - case "$output" in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.a" - - $show "creating $output" - - # Only create the output if not a dry run. - if test -z "$run"; then - $echo > $output "\ -# $output - a libtool library file -# Generated by ltmain.sh - GNU $PACKAGE $VERSION - -# The name that we can dlopen(3). -dlname='$dlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Directory that this library needs to be installed in: -libdir='$install_libdir'\ -" - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $objdir && $LN_S ../$output $output)" - $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1 - ;; - esac - exit 0 - ;; - - # libtool install mode - install) - modename="$modename: install" - - # There may be an optional /bin/sh argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL"; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg="$nonopt" - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir= - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest="$arg" - continue - fi - - case "$arg" in - -d) isdir=yes ;; - -f) prev="-f" ;; - -g) prev="-g" ;; - -m) prev="-m" ;; - -o) prev="-o" ;; - -s) - stripme=" -s" - continue - ;; - -*) ;; - - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest="$arg" - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit 1 - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test -n "$isdir"; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test $# -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - fi - case "$destdir" in - /* | [A-Za-z]:\\*) ;; - *) - for file in $files; do - case "$file" in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case "$file" in - *.a) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - library_names= - old_library= - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/" - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$realname $destdir/$realname" - $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? - test "X$dlname" = "X$realname" && dlname= - - if test $# -gt 0; then - # Delete the old symlinks. - rmcmd="$rm" - for linkname - do - rmcmd="$rmcmd $destdir/$linkname" - done - $show "$rmcmd" - $run $rmcmd - - # ... and create new ones. - for linkname - do - test "X$dlname" = "X$linkname" && dlname= - $show "(cd $destdir && $LN_S $realname $linkname)" - $run eval "(cd $destdir && $LN_S $realname $linkname)" - done - fi - - if test -n "$dlname"; then - # Install the dynamically-loadable library. - $show "$install_prog $dir/$dlname $destdir/$dlname" - $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - eval cmds=\"$postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - $show "$install_prog $file $destdir/$name" - $run eval "$install_prog $file $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case "$destfile" in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'` - ;; - *.o) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit 0 - ;; - - *) - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - link_against_libtool_libs= - finalize_command= - - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Check the variables that should have been set. - if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 - exit 1 - fi - - finalize=yes - for lib in $link_against_libtool_libs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case "$lib" in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" - if test -z "$libdir"; then - $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2 - elif test -f "$libfile"; then : - else - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - if test "$hardcode_action" = relink; then - if test "$finalize" = yes; then - $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2 - $show "$finalize_command" - if $run eval "$finalize_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue - fi - file="$objdir/$file"T - else - $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - $show "$install_prog$stripme $file $dest" - $run eval "$install_prog\$stripme \$file \$dest" || exit $? - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - # Do each command in the postinstall commands. - eval cmds=\"$old_postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec $SHELL $0 --finish$current_libdirs - exit 1 - fi - - exit 0 - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - eval cmds=\"$finish_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" - fi - done - fi - - echo "------------------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo - echo "To link against installed libraries in a given directory, LIBDIR," - echo "you must use the \`-LLIBDIR' flag during linking." - echo - echo " You will also need to do one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - echo " - use the \`$flag' linker flag" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "------------------------------------------------------------------------------" - exit 0 - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit 1 - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test -f "$file"; then : - else - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - dir= - case "$file" in - *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit 1 - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case "$file" in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - - # Now actually exec the command. - eval "exec \$cmd$args" - - $echo "$modename: cannot exec \$cmd$args" - exit 1 - else - # Display what would be done. - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - $echo "$cmd$args" - exit 0 - fi - ;; - - # libtool uninstall mode - uninstall) - modename="$modename: uninstall" - rm="$nonopt" - files= - - for arg - do - case "$arg" in - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - rmfiles="$file" - - case "$name" in - *.la) - # Possibly a libtool archive, so verify it. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $dir/$n" - test "X$n" = "X$dlname" && dlname= - done - test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" - test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" - - $show "$rm $rmfiles" - $run $rm $rmfiles - - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - eval cmds=\"$postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - eval cmds=\"$old_postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - done - IFS="$save_ifs" - fi - - # FIXME: should reinstall the best remaining shared library. - fi - ;; - - *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'` - rmfiles="$rmfiles $dir/$oldobj" - fi - $show "$rm $rmfiles" - $run $rm $rmfiles - ;; - - *) - $show "$rm $rmfiles" - $run $rm $rmfiles - ;; - esac - done - exit 0 - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 - ;; - esac - - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 -fi # test -z "$show_help" - -# We need to display help for each of the modes. -case "$mode" in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - --n, --dry-run display commands without modifying any files - --features display configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --version print version information - -MODE must be one of the following: - - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE." - exit 0 - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to dld_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -static do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only -library objects (\`.lo' files) may be specified, and \`-rpath' is required. - -If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar' -and \`ranlib'. - -If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is -created, otherwise an executable program is created." - ;; - -uninstall) - $echo -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; -esac - -echo -$echo "Try \`$modename --help' for more information about other modes." - -exit 0 - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff --git a/buildscripts/mail-address.sh b/buildscripts/mail-address.sh deleted file mode 100755 index 37e1141751..0000000000 --- a/buildscripts/mail-address.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# mail-address -if [ "$MAILADDRESS" != "" ]; then - echo $MAILADDRESS -else - echo "mail-address:6: warning: \$MAILADDRESS undefined" > /dev/stderr - echo $USER@`hostname` -fi diff --git a/buildscripts/profile-conf.sh b/buildscripts/profile-conf.sh deleted file mode 100755 index 1445c2434c..0000000000 --- a/buildscripts/profile-conf.sh +++ /dev/null @@ -1,2 +0,0 @@ - -configure --prefix=$HOME/usr --enable-profiling --enable-config=optprof --enable-optimise --disable-checking --enable-debugging diff --git a/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh deleted file mode 100755 index e2a3da89cb..0000000000 --- a/buildscripts/ps-to-gifs.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# ps-to-gifs, convert PS to multiple gifs or other bitmaps - -usage() -{ - cat < $OUTFILE -PPMS=`ls $BASE*ppm` -for i in $PPMS; do - o=`dirname $i`/`basename $i .ppm`.$GIF - cat $i | $CROP | $PNMTOGIF $color > $o - rm $i -done - -if [ "x$OUTFILE" != "x" ]; then - mv $BASE-page1.$GIF $BASE.$GIF -fi - diff --git a/buildscripts/run-lilypond.sh b/buildscripts/run-lilypond.sh deleted file mode 100755 index 2a69e5a3e2..0000000000 --- a/buildscripts/run-lilypond.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -LILYTOPDIR=$1 -shift -export LILYINCLUDE="$LILYTOPDIR/init:$LILYTOPDIR/mf/out:$LILYINCLUDE" -export TEXINPUTS="$LILYTOPDIR/tex:$TEXINPUTS" -export MFINPUTS="$LILYTOPDIR/mf:$TEXINPUTS" - -$LILYTOPDIR/lily/out/lilypond $* diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh deleted file mode 100755 index 9775748d18..0000000000 --- a/buildscripts/set-lily.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh -# set-lily.sh --- configure LilyPond sourcetree; -# -# configure Lily in $HOME/usr/src/lilypond-x.x.x, -# and without installing -# - -PACKAGE_NAME=LilyPond -export PACKAGE_NAME -prefix=$HOME/usr -sources=$prefix/src - -showln () -{ - (set -x; ln $*) -} - -testmkdir () -{ - if [ ! -x $1 ]; then - (set -x; mkdir -p $1) - fi -} - -testvar () -{ - var=`eval echo '\$'$1` - if [ "`echo "$var" | grep $2`" = "" ]; then -# if ! expr "$var" : ".*\($2\).*" ; then - eval $1=$3 - export $1 - echo " $1=$3" - echo " export $1" - fi -} - - -. ./stepmake/bin/package-zet.sh -#urg. LILYPOND_PREFIX, _SOURCEDIR, PATH, *INPUTS all broken -#sourcetree=`basename \`pwd\`` -#(cd .. ; rm lilypond-devel ; showln -s $sourcetree lilypond-devel) - - -echo You should add the following to your profile script -echo -testvar LILYPONDPREFIX lily $LILYPOND_SOURCEDIR -testvar MFINPUTS lily .:$MFINPUTS:$LILYPOND_SOURCEDIR/mf -testvar TEXINPUTS lily .:$TEXINPUTS:$LILYPOND_SOURCEDIR/ps:$LILYPOND_SOURCEDIR/tex -testvar GS_FONTPATH lily $HOME/usr/src/lilypond/mf/out -testvar MAILADDRESS "@" $USER@`hostname` -echo - -echo Setting up links -echo -showln -sf $LILYPOND_SOURCEDIR/lily/out/lilypond $prefix/bin/lilypond -showln -sf $LILYPOND_SOURCEDIR/midi2ly/out/midi2ly $prefix/bin/midi2ly -showln -sf $LILYPOND_SOURCEDIR/scripts/out/ly2dvi $prefix/bin/ly2dvi -showln -sf $LILYPOND_SOURCEDIR/scripts/out/mudela-book $prefix/bin/mudela-book -showln -sf $LILYPOND_SOURCEDIR/buildscripts/out/genheader $prefix/bin/genheader -showln -sf $LILYPOND_SOURCEDIR/scripts/out/as2text $prefix/bin/as2text - - -testmkdir $prefix/share -rm -rf $prefix/share/lilypond -showln -sf $sources/lilypond $prefix/share/lilypond - - -BUILDDIR=`pwd` -LOCALES="de fr it ja nl ru" -for i in $LOCALES; do - dir=$BUILDDIR/share/locale/$i/LC_MESSAGES - if test ! -x $dir ; then - mkdir -p $dir - fi - rm -f $dir/lilypond.mo - showln -sf $BUILDDIR/po/out/$i.mo $dir/lilypond.mo -done -rm -f afm; showln -sf $BUILDDIR/mf/out afm -rm -f tfm; showln -sf $BUILDDIR/mf/out tfm - -TFM_FONTS="cmr msam" -for i in $TFM_FONTS; do - dir=`kpsewhich tfm ${i}10.tfm` - TFM_PATH="$TFM_PATH `dirname $dir`" -done - -# urg: GNU make's $(word) index starts at 1 -i=1 -for dir in $TFM_PATH; do - rm -f $BUILDDIR/tfm.$i; - showln -s $dir $BUILDDIR/tfm.$i - i=$((i + 1)) -done - -if [ -f ../.gdbinit.lilypond ]; -then - showln -f ../.gdbinit.lilypond .gdbinit -fi - -if [ -f ../.dstreamrc ] -then - showln -f ../.dstreamrc . -fi -echo - -echo Starting configuration -echo -(set -x; ./configure --prefix=$prefix --enable-debugging --enable-printing --enable-checking --disable-optimise) - -echo "Making tags in background..." -make TAGS > /dev/null 2>&1 & diff --git a/buildscripts/show-current.sh b/buildscripts/show-current.sh deleted file mode 100755 index 7ae9c3fb03..0000000000 --- a/buildscripts/show-current.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# show-current.sh - -. $LILYPOND_SOURCEDIR/VERSION -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL -if [ "$MY_PATCH_LEVEL" != "" ]; then - VERSION=$VERSION.$MY_PATCH_LEVEL -fi -echo $VERSION diff --git a/input/bugs/addlyrics.ly b/input/bugs/addlyrics.ly index b278d881cb..f38a604e1a 100644 --- a/input/bugs/addlyrics.ly +++ b/input/bugs/addlyrics.ly @@ -12,7 +12,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/bugs/knee.ly b/input/bugs/knee.ly index eee5e3887e..f5590cf4a5 100644 --- a/input/bugs/knee.ly +++ b/input/bugs/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.5"; +\version "1.3.59"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/denneboom.ly b/input/denneboom.ly index 9ecd76a180..ff0f985206 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.3.42"; +\version "1.3.59"; oden = \lyrics{ O | diff --git a/input/example-3.ly b/input/example-3.ly index 025a3a7bf7..f245ae37b1 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 96ae93f9ba..cd427c7eca 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -56,4 +56,4 @@ of a certain tune (Jazz, Real Book, for example), like } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index fee4e0cb9b..cfccea91c9 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -22,13 +22,13 @@ * organ staff... %} -\version "1.3.42"; +\version "1.3.59"; praeludium_commands = \notes { \time 4/4; - \key e; + \key e \major; } praeludium_right = \notes { @@ -99,7 +99,7 @@ praeludium_pedal = \notes \relative c{ fugaII_commands = \notes{ \time3/4; - \key e; % E-major + \key e \major; % E-major } fugaII_right = \notes \relative c'' { diff --git a/input/rhythm.ly b/input/rhythm.ly index 05ace2961e..df4bfcb489 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.3.42"; +\version "1.3.59"; ritme = \notes\transpose c'' { \time 4/4; diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 8fbb694dcd..1bb791a165 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html http://www.Arkkra.com/doc/star.ps %} -\version "1.3.42"; +\version "1.3.59"; % TODO: % @@ -35,7 +35,7 @@ http://www.Arkkra.com/doc/star.ps global = \notes { \time 3/4; - \key d; + \key d \major; \partial 4; } diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index e397bb363b..642aaa8bae 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index c4a4ab84df..fa80b18037 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index eeeb0062f2..87e04d39d7 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 0cc40434da..fd96d8c81c 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -30,4 +30,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 626449eaa8..c71fc9116c 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -21,4 +21,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/beams.ly b/input/test/beams.ly index aa6dd10886..fff0213aa8 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.42"; +\version "1.3.59"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index efa0424573..0920abe866 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,8 +1,8 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes \relative c' { - \key es; \time 3/4; + \key es \major; \time 3/4; < \context Voice = two { \stemdown es4 bes es } \context Voice = one { \stemup g4 as g } > | diff --git a/input/test/broken.ly b/input/test/broken.ly index 26626169e1..656a96ec38 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.42"; +\version "1.3.59"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index ab7d7e993e..a2ed40d107 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index ab5e8fb1c2..435c465cfa 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/chords.ly b/input/test/chords.ly index 4d1383e2ad..1e1ed03ee7 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; %{ Would this be acceptable/good enough/convenient for entry? @@ -37,21 +37,21 @@ keys = \notes{ s1 s1 s1 s1 s1 s1 - \key g; s1 - \key d; s1 - \key a; s1 - \key e; s1 - \key b; s1 - \key fis; s1 - \key c; s1 - \key f; s1 - \key bes; s1 - \key es; s1 - \key as; s1 - \key des; s1 - \key ges; s1 - \key c; s1*2 - \key c; s1*6 + \key g \major; s1 + \key d \major; s1 + \key a \major; s1 + \key e \major; s1 + \key b \major; s1 + \key fis \major; s1 + \key c \major; s1 + \key f \major; s1 + \key bes \major; s1 + \key es \major; s1 + \key as \major; s1 + \key des \major; s1 + \key ges \major; s1 + \key c \major; s1*2 + \key c \major; s1*6 } \score{ diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 364547fed3..97ff37a3c3 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index ea481c472a..c1b0d55e6c 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.42"; +\version "1.3.59"; twovoice = \context Staff \notes < \context Voice=i { \stemdown c4 d e f g2~ g4 a [c8 d e f] c2| } diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 55b9152232..b7640f5e40 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score { diff --git a/input/test/extender.ly b/input/test/extender.ly index ff42bcce2b..a088a49a77 100644 --- a/input/test/extender.ly +++ b/input/test/extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 146e52e7ac..e5f208d4cc 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 970031c1ba..9349d53ab4 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; FontBody= \notes\transpose c''{ \bar "|:"; @@ -28,19 +28,19 @@ FontBody= \notes\transpose c''{ e32 _| g'32^| g''32-\ltoe g''32-\lheel e64-\rtoe g'64-\rheel c4... | \context Voice = mensural \relative c'' { -\property Voice . noteHeadStyle = "mensural" +\property Voice . noteHeadStyle = #'mensural \property Voice. stemCentered = ##t c\maxima*1/8 c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 } - \property Voice . noteHeadStyle = "harmonic" + \property Voice . noteHeadStyle = #'harmonic \transpose c'{ \time 4/4; \property Voice . textStyle = "finger" - \property Voice . noteHeadStyle = "diamond" + \property Voice . noteHeadStyle = #'diamond c1^"1" d2^"2" e4^"3" - \property Voice . noteHeadStyle = "cross" + \property Voice . noteHeadStyle = #'cross f4^"4" g4^"5" \property Voice . noteHeadStyle = "" diff --git a/input/test/font.ly b/input/test/font.ly index 83741ed452..e7e4eb13b2 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.42"; +\version "1.3.59"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index a05324fd6a..480b237936 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.42"; +\version "1.3.59"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 4c2440e14a..3aaf6c2458 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 61354761e3..d6d0cd320e 100644 --- a/input/test/gmsusd.ly +++ b/input/test/gmsusd.ly @@ -3,7 +3,7 @@ % perhaps the current modifier approach is too simplistic -\version "1.3.42"; +\version "1.3.59"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index a3de6d41c6..0c0cb2f314 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; %{ diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index 0bf06da305..920aabbdac 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index c09fb85c82..28bd2f0163 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; toeter_i = \notes\relative c <{ \property Staff.instrument = #"Toeters" diff --git a/input/test/hyphen.ly b/input/test/hyphen.ly index f97c78d878..45db2afa18 100644 --- a/input/test/hyphen.ly +++ b/input/test/hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 08a8794003..974ab04d5e 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.42"; +\version "1.3.59"; incipit = \notes\relative c'{ @@ -27,7 +27,7 @@ violin = \notes\relative c''{ } BC = \notes\relative c{ - \key d; + \key d \major; \time 2/2; \clef "bass"; diff --git a/input/test/keys.ly b/input/test/keys.ly index 35b11a9a15..1b694cd321 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,16 +1,16 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes \relative c'' { \property Staff. createKeyOnClefChange = ##t - \key bes; c2 -% \key c ; % \minor; - \key es ; % \minor; + \key bes \major; c2 +% \key c \major; % \minor; + \key es \major; % \minor; c2 \break - \key bes ; % \major; - c2 \clef alto; c2 \key d; \clef treble; c2 + \key bes \major; % \major; + c2 \clef alto; c2 \key d \major; \clef treble; c2 \property Staff. keySignature = #'((2 . -1) (6 . -1) (4 . -1)) e2 } diff --git a/input/test/keys2.ly b/input/test/keys2.ly index b9209cfe48..499d0b1e8d 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; blah = \notes { diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index fe6e070526..83e016bbfe 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -21,4 +21,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/knee.ly b/input/test/knee.ly index b48bfd7bd8..f5590cf4a5 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index ae6a1f405b..a1e28d0b80 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index 724732b04a..8086e1eb1a 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/mark.ly b/input/test/mark.ly index 2a46b75f39..522d529275 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index ab1260b632..774abcb841 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/multi-measure-rest.ly b/input/test/multi-measure-rest.ly index c0e477979c..267f3081d2 100644 --- a/input/test/multi-measure-rest.ly +++ b/input/test/multi-measure-rest.ly @@ -1,5 +1,6 @@ +\version "1.3.59"; -\score { \notes { \time 3/4; \key cis; +\score { \notes { \time 3/4; \key cis \major; R2.*15 R2. R2.*7 } \paper { \translator { diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index f6a35de05a..579c3db142 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; voice_one = \notes\transpose c''{ \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 86202823ca..0ec56ee0cc 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -40,4 +40,4 @@ c4 c2 c8 c16 c16 c1 c\breve c\longa } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index c4d177381b..7df9324746 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 34078216c7..c9b7da5316 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; m = \notes \relative c''{ diff --git a/input/test/ossia.ly b/input/test/ossia.ly index de27172cf2..bcc443185e 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score { diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index 05dc23fbdf..c6944f7ea6 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -38,4 +38,4 @@ restsII = \context Staff \notes { } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index a84dfc2700..96967a613d 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; blah = \notes{ \transpose c'' { diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 6eddcb7cf7..2df0f6f404 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.42"; +\version "1.3.59"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index 914afd1fe5..d6409add0b 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -36,4 +36,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 4372acc205..4e5f76f18f 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.42"; +\version "1.3.59"; \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index 9ae3325894..e47e3eb6ba 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 03debe0993..d065f3ce59 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 89ff29ad66..48efac0a56 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -18,9 +18,9 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; e4 dis4 e2 } \context Voice = VB { \property Voice.verticalDirection= -1 [cis8 a] [fis b] gis2 } - {\key e; } + {\key e \major; } > - \context Staff = SB { \clef "bass"; \key e; + \context Staff = SB { \clef "bass"; \key e \major; [a,,16 e dis e] [b'8 b,] [e16 e, gis b] e4 } > @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 15c560e909..324150f03c 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.3.42"; +\version "1.3.59"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index f0db341dcf..f2ea46d754 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index 712773b5cc..ce2817935b 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -1,6 +1,6 @@ % test staff margin with partial measure. -\version "1.3.42"; +\version "1.3.59"; \score { \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index 290fd256b4..ef8617d874 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.42"; +\version "1.3.59"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 6ee2f1ad75..c84e272264 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 48beef13b1..48a6fc3c29 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -5,7 +5,7 @@ \property Voice.fontSize = #-1 \property Voice . dynamicDirection = \up \stemdown -%\key gis; +%\key gis \major; c8 d [e f g a] b c \ff } @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 9ed889d5f1..d1b8151eef 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; \score{ \context Voice\notes \relative c''{ %%? diff --git a/input/test/stem.ly b/input/test/stem.ly index 1ccb9c5978..5fe3bf91c0 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.42"; +\version "1.3.59"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index dc61889f27..80153ee52d 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.42"; +\version "1.3.59"; % this is an example of extreme dynamics @@ -16,7 +16,7 @@ instrument= "Violoncello"; \notes \relative c{ \clef "bass"; - \key d; + \key d \major; | ~ r8 r4 | a2\ppp\cr a2\rc\p\decr | ~ r8 r4 | a2\pppp ~ a8 r8 r4 | a2\ppppp ~ a8 r8 r4 | r4 a8_"pizz" @@ -32,7 +32,7 @@ instrument= "Violoncello"; \notes \relative c{ \clef "bass"; - \key c; + \key c \major; | | ~ ~ | } diff --git a/input/test/thumb.ly b/input/test/thumb.ly index acd3319b8d..14e1e1197d 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.3.42"; +\version "1.3.59"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/title.ly b/input/test/title.ly index 261668a4fa..ae4d4650ae 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.42"; +\version "1.3.59"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 93aa108473..d9a576b634 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,16 +22,16 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; vOne = \notes \relative c''{ \clef"violin"; - \key d; + \key d \major; \time 2/4 ; d4 d | - \key fis; + \key fis \major; fis4 fis | - \key es; + \key es \major; c4 c | } diff --git a/input/test/tup.ly b/input/test/tup.ly index 8c1d54b4c3..c236afff84 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index d39c302143..7ce624fbd9 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,4 +1,4 @@ -\version "1.3.47" +\version "1.3.59" \score { \context Voice \notes\relative c'' { diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index 0ec7feb0d0..a203483870 100644 --- a/input/test/twinkle-as5.ly +++ b/input/test/twinkle-as5.ly @@ -6,7 +6,7 @@ enteredby = "hwn and jcn"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "paper-as5.ly" diff --git a/input/test/updown.ly b/input/test/updown.ly index 9b19cefadd..fdc47121c8 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -10,7 +10,7 @@ {\voicetwo c}> - \version "1.3.42"; + \version "1.3.59"; } \paper { } diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 23ab328f83..29d1ab180e 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.42"; +\version "1.3.59"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 53a6aaf636..57de581d51 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.42"; +\version "1.3.59"; diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 2930e6ca21..2483ba6094 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; melodie = \notes\relative c'' { \clef "violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index af10d1800c..afa9353aa7 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats, auto beaming, adding lyrics to notes, hyphens %} -\version "1.3.42"; +\version "1.3.59"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/command-request.cc b/lily/command-request.cc index fea2de22a4..92143f8a55 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -98,25 +98,50 @@ Tempo_req::do_equal_b (Request const *r) const return t&& t->dur_.length_mom ()== dur_.length_mom () && metronome_i_ == t->metronome_i_; } -void -Key_change_req::do_print () const -{ -} -Key_change_req::Key_change_req () -{ - key_ = 0; -} -Key_change_req::Key_change_req (Key_change_req const&s) - : Request (s) + +bool +Key_change_req::do_equal_b (Request const * req) const { - key_ = s.key_ ? new Newkey_def (*s.key_) : 0; + Key_change_req const * k = dynamic_cast (req); + return k && scm_equal_p (pitch_alist_, k->pitch_alist_); } -Key_change_req::~Key_change_req () + + +void +Key_change_req::transpose (Musical_pitch p) { - delete key_; + SCM newlist = SCM_EOL; + for (SCM s = pitch_alist_; gh_pair_p (s); s = gh_cdr (s)) + { + SCM k = gh_caar (s); + + if (gh_pair_p (k)) + { + Musical_pitch orig (gh_list (gh_car (k), gh_cdr (k), gh_cdr (s), SCM_UNDEFINED)); + + orig.transpose (p); + + SCM key = gh_cons (gh_int2scm (orig.octave_i_), + gh_int2scm (orig.notename_i_)); + + newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)), + newlist); + } + else if (gh_number_p (k)) + { + Musical_pitch orig (gh_list (gh_int2scm (0), k, gh_cdar (s), SCM_UNDEFINED)); + orig.transpose (p); + + SCM key =gh_int2scm (orig.notename_i_); + newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)), + newlist); + } + } + + pitch_alist_ = newlist; } Break_req::Break_req () @@ -131,10 +156,3 @@ Mark_req::do_equal_b (Request const * r) const Mark_req const * other = dynamic_cast (r); return other && scm_equal_p (other->mark_label_, mark_label_); } - -void -Key_change_req::transpose (Musical_pitch p) -{ - key_->transpose (p); -} - diff --git a/lily/identifier.cc b/lily/identifier.cc index bd3b6b6c2a..4c6284eb01 100644 --- a/lily/identifier.cc +++ b/lily/identifier.cc @@ -116,7 +116,6 @@ Class ## _identifier::do_print () const\ STRING_PRINT(Duration); STRING_PRINT(Real); STRING_PRINT(int); -STRING_PRINT(String); #define DEFAULT_STR(Class) \ String \ @@ -127,7 +126,7 @@ Class ## _identifier::do_str () const\ DEFAULT_STR(int); DEFAULT_STR(Real); -DEFAULT_STR(String); + /* @@ -166,7 +165,6 @@ IMPLEMENT_ID_CLASS(Duration); IMPLEMENT_ID_CLASS(Translator_group); IMPLEMENT_ID_CLASS(int); IMPLEMENT_ID_CLASS(Real); -IMPLEMENT_ID_CLASS(String); IMPLEMENT_ID_CLASS(Music); IMPLEMENT_ID_CLASS(Score); IMPLEMENT_ID_CLASS(Request); @@ -178,7 +176,6 @@ VIRTUAL_ACCESSOR(Translator_group); DEFAULT_ACCESSOR(Duration); DEFAULT_ACCESSOR(int); DEFAULT_ACCESSOR(Real); -DEFAULT_ACCESSOR(String); DEFAULT_ACCESSOR(Score); DEFAULT_ACCESSOR(Midi_def); DEFAULT_ACCESSOR(Paper_def); diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index a79e711325..845598a3ad 100644 --- a/lily/include/command-request.hh +++ b/lily/include/command-request.hh @@ -14,7 +14,6 @@ #include "array.hh" #include "duration.hh" #include "musical-pitch.hh" -#include "newkey-def.hh" #include "protected-scm.hh" class Break_req : public Request { @@ -99,24 +98,16 @@ class Breathing_sign_req : public Request { /** Handle key changes. - Routines for sharps and flats are separated, - so that caller may identify non-conventional keys. */ -/* - UGH! - */ class Key_change_req : public Request { public: - Key_change_req (); - ~Key_change_req(); - Key_change_req(Key_change_req const &); - Newkey_def *key_; + Protected_scm pitch_alist_; protected: VIRTUAL_COPY_CONS(Music); void transpose (Musical_pitch d); - virtual void do_print () const; + bool do_equal_b (Request const * )const; }; class Clef_change_req : public Request { diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh index f6f129d493..94bceeebb8 100644 --- a/lily/include/identifier.hh +++ b/lily/include/identifier.hh @@ -24,7 +24,6 @@ class Midi_def_identifier; class Paper_def_identifier; class Real_identifier; class int_identifier; -class String_identifier; class Request_identifier; class Score_identifier; class Duration_identifier; @@ -60,7 +59,6 @@ struct Identifier : public Input { IDACCESSOR(Midi_def) IDACCESSOR(Paper_def) IDACCESSOR(Real) - IDACCESSOR(String) IDACCESSOR(Request) IDACCESSOR(Score) IDACCESSOR(int) @@ -89,7 +87,6 @@ struct Class ## _identifier : Identifier {\ DECLARE_ID_CLASS(Translator_group); DECLARE_ID_CLASS(Duration); DECLARE_ID_CLASS(Real); -DECLARE_ID_CLASS(String); DECLARE_ID_CLASS(General_script_def); DECLARE_ID_CLASS(Music); DECLARE_ID_CLASS(int); diff --git a/lily/include/key-def.hh b/lily/include/key-def.hh index 65296f8106..e69de29bb2 100644 --- a/lily/include/key-def.hh +++ b/lily/include/key-def.hh @@ -1,2 +0,0 @@ - -#error diff --git a/lily/include/moment.hh b/lily/include/moment.hh index ae6dc6f8ce..53afd01816 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -15,7 +15,8 @@ /** Rationals with glue for Guilification; - */ + + FIXME: remove self_scm_ and then remove this class */ struct Moment : public Rational { Moment () { self_scm_ = SCM_EOL; } diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index fc00a1465c..b3113bf94b 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -53,13 +53,14 @@ public: void start_main_input (); void set_chordmodifier_table (Notename_table*tab_p); void set_notename_table (Notename_table*tab_p); - Identifier*lookup_identifier (String s); + + SCM lookup_identifier (String s); void push_note_state(); void push_chord_state(); void push_lyric_state(); void pop_state(); void LexerError (char const *); - void set_identifier (String str, Identifier* i, bool unique_b = true); + void set_identifier (String str, SCM); bool note_state_b() const; bool chord_state_b() const; bool lyric_state_b() const; diff --git a/lily/include/newkey-def.hh b/lily/include/newkey-def.hh index dfa20c6c6b..e69de29bb2 100644 --- a/lily/include/newkey-def.hh +++ b/lily/include/newkey-def.hh @@ -1,36 +0,0 @@ -/* - newkey-def.hh -- declare Newkey_def - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ - -#ifndef NEWKEY_DEF_HH -#define NEWKEY_DEF_HH - -#include "protected-scm.hh" -#include "musical-pitch.hh" - -class Newkey_def -{ - -public: - Protected_scm pitch_alist_; - - Newkey_def(); - - /// return number of flats in key - int flats_i () const; - - /// return number of sharps in key - int sharps_i () const; - int accs_i (int) const; - - void transpose (Musical_pitch d); -}; - -#endif /* NEWKEY_DEF_HH */ - - diff --git a/lily/include/scope.hh b/lily/include/scope.hh index 2fef19f932..f1f4d8a1dc 100644 --- a/lily/include/scope.hh +++ b/lily/include/scope.hh @@ -21,26 +21,18 @@ public: bool elem_b (String ) const; bool elem_b (SCM s) const; Identifier *elem (String) const; - Identifier *elem (SCM) const; + Identifier *elem (SCM) const; + + SCM scm_elem (String) const; + SCM scm_elem (SCM) const; + void set (String, Identifier *); + void set (String, SCM); Scope (); Scope (Scope const &); ~Scope (); friend class Scope_iter; }; -#if 0 -class Scope_iter { - Hash_table_iter * iter_; -public: - void operator ++(int); - bool ok ()const; - Scope_iter(Scope const&); - String key () const; - Identifier* val () const; - SCM scm_key () const; -}; - -#endif #endif /* SCOPE_HH */ diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index d5091eb70f..64f4e4f0a5 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -6,7 +6,6 @@ (c) 1997--2000 Han-Wen Nienhuys */ - #include "key-item.hh" #include "command-request.hh" #include "musical-request.hh" @@ -139,10 +138,10 @@ Key_engraver::do_pre_move_processing () void Key_engraver::read_req (Key_change_req const * r) { - if (!r->key_) + if (r->pitch_alist_ == SCM_UNDEFINED) return; - SCM n = scm_list_copy (r->key_->pitch_alist_); + SCM n = scm_list_copy (r->pitch_alist_); SCM accs = SCM_EOL; for (SCM s = get_property ("keyAccidentalOrder"); gh_pair_p (s); s = gh_cdr (s)) diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 81fa1c5296..b55210a448 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -26,7 +26,7 @@ Key_performer::~Key_performer () void Key_performer::do_process_music () { - if (key_req_l_ && key_req_l_->key_) + if (key_req_l_ && key_req_l_->pitch_alist_ != SCM_UNDEFINED) { audio_p_ = new Audio_key (); // *key_req_l_->key_); Audio_element_info info (audio_p_, key_req_l_); diff --git a/lily/lexer.ll b/lily/lexer.ll index 23692d60d7..57d9537bf1 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -188,18 +188,12 @@ HYPHEN -- if (s.length_i () && (s[s.length_i () - 1] == ';')) s = s.left_str (s.length_i () - 1); DEBUG_OUT << "#include `\\" << s << "'\n"; - Identifier * id = lookup_identifier (s); - if (id) - { - String* s_l = id->access_content_String (false); - DEBUG_OUT << "#include `" << *s_l << "'\n"; - new_input (*s_l, source_global_l); - - yy_pop_state (); - } - else - { - String msg (_f ("undefined identifier: `%s'", s )); + SCM sid = lookup_identifier (s); + if (gh_string_p (sid)) { + new_input (ly_scm2string (sid), source_global_l); + yy_pop_state (); + } else { + String msg (_f ("wrong or undefined identifier: `%s'", s )); LexerError (msg.ch_C ()); } } @@ -475,11 +469,21 @@ My_lily_lexer::scan_escaped_word (String str) if (l != -1) { return l; } - Identifier * id = lookup_identifier (str); + SCM sid = lookup_identifier (str); + if (gh_string_p (sid)) { + yylval.scm = sid; + return STRING_IDENTIFIER; + } + + Identifier * id = unsmob_identifier (sid); if (id) { yylval.id = id; return id->token_code_i_; + } else if (sid != SCM_UNDEFINED) { + yylval.scm = sid; + return SCM_IDENTIFIER; } + if ((YYSTATE != notes) && (YYSTATE != chords)) { SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F); diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 6f96577310..6336f7dd11 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -373,7 +373,11 @@ ly_number2string (SCM s) return gh_str02scm (str); } -#define TEST_GC +/* + Undef this to see if GUILE GC is causing too many swaps. + */ + +// #define TEST_GC #ifdef TEST_GC #include diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index dc78eb09da..110aea1c93 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -36,10 +36,6 @@ Line_of_score::element_count () const return scm_ilength ( get_elt_pointer ("all-elements")); } - -/* - Ugh. this is grossly hairy. - */ void Line_of_score::typeset_element (Score_element * elem_p) { diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 8e8babad66..172961dacf 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -3,12 +3,10 @@ (c) 1997--2000 Han-Wen Nienhuys */ -// clean up! #include "musical-request.hh" #include "command-request.hh" #include "local-key-item.hh" -#include "debug.hh" #include "key-item.hh" #include "tie.hh" #include "note-head.hh" @@ -19,8 +17,6 @@ #include "side-position-interface.hh" #include "engraver.hh" -#include "parray.hh" - /** Make accidentals. Catches note heads, ties and notices key-change @@ -40,32 +36,32 @@ protected: virtual void do_removal_processing (); public: - SCM last_accs_; + // todo -> property + SCM last_keysig_; Key_engraver *key_grav_l_; - Array mel_l_arr_; - Array support_l_arr_; - Link_array forced_l_arr_; - Link_array tied_l_arr_; + + Link_array mel_l_arr_; + Link_array support_l_arr_; + Link_array forced_l_arr_; + Link_array tied_l_arr_; Local_key_engraver(); - bool self_grace_b_; + Grace_align_item * grace_align_l_; }; - - Local_key_engraver::Local_key_engraver() { key_grav_l_ = 0; key_item_p_ =0; grace_align_l_ =0; - last_accs_ = SCM_EOL; + last_keysig_ = SCM_EOL; } - void Local_key_engraver::do_creation_processing () { - last_accs_ = get_property ("keySignature"); + last_keysig_ = get_property ("keySignature"); + daddy_trans_l_->set_property ("localKeySignature", last_keysig_); } void @@ -144,6 +140,11 @@ Local_key_engraver::process_acknowledged () } } } + + /* + UGH ! + */ + if (key_item_p_ && grace_align_l_) { Side_position_interface (grace_align_l_).add_support (key_item_p_); @@ -193,8 +194,6 @@ Local_key_engraver::acknowledge_element (Score_element_info info) Note_req * note_l = dynamic_cast (info.req_l_); Note_head * note_head = dynamic_cast (info.elem_l_); - - if (he_gr != selfgr) return; @@ -212,7 +211,6 @@ Local_key_engraver::acknowledge_element (Score_element_info info) void Local_key_engraver::do_process_music() { - SCM smp = get_property ("measurePosition"); Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); @@ -222,7 +220,7 @@ Local_key_engraver::do_process_music() if (!to_boolean (get_property ("noResetKey"))) daddy_trans_l_->set_property ("localKeySignature", sig); } - else if (last_accs_ != sig) + else if (last_keysig_ != sig) { daddy_trans_l_->set_property ("localKeySignature", sig); } diff --git a/lily/main.cc b/lily/main.cc index 3bade16b9d..3f7a41e000 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -303,6 +303,12 @@ main (int argc, char **argv) debug_init (); // should be first setup_paths (); + /* + prepare guile for heavy mem usage. + */ + setenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304", 0); + setenv ("GUILE_MAX_SEGMENT_SIZE", "8388608", 0); + oparser_global_p = new Getopt_long(argc, argv,theopts); while (Long_option_init const * opt = (*oparser_global_p)()) { diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index d891ef9f71..6b4ee8b519 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -93,9 +93,10 @@ Music_output_def::get_default_output () const { if (safe_global_b || !scope_p_->elem_b ("output")) return ""; - Identifier * id = scope_p_->elem ("output"); + SCM s = scope_p_->scm_elem ("output"); - String *p = id->access_content_String (false); - return p ? *p : String (""); + + + return gh_string_p (s) ? ly_scm2string (s) : String (""); } diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index fb238c2024..adfde15530 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -92,15 +92,15 @@ My_lily_lexer::lookup_keyword (String s) return keytable_p_->lookup (s.ch_C ()); } -Identifier* +SCM My_lily_lexer::lookup_identifier (String s) { SCM sym = ly_symbol2scm (s.ch_C()); for (int i = scope_l_arr_.size (); i--; ) if (scope_l_arr_[i]->elem_b (sym)) - return scope_l_arr_[i]->elem(sym); - return 0; + return scope_l_arr_[i]->scm_elem(sym); + return SCM_UNDEFINED; } void @@ -111,23 +111,14 @@ My_lily_lexer::start_main_input () } void -My_lily_lexer::set_identifier (String name_str, Identifier* i, bool ) +My_lily_lexer::set_identifier (String name_str, SCM s) { - Identifier *old =0; - if (scope_l_arr_.top ()->elem_b (name_str)) - old = scope_l_arr_.top ()->elem(name_str); - - - if (old) - { - // delete old; - } if (lookup_keyword (name_str) >= 0) { warning ( _f ("Identifier name is a keyword: `%s'", name_str)); } - scope_l_arr_.top ()->set (name_str, i); + scope_l_arr_.top ()->set (name_str, s); } My_lily_lexer::~My_lily_lexer() diff --git a/lily/newkey-def.cc b/lily/newkey-def.cc index 6d8e5836f8..e69de29bb2 100644 --- a/lily/newkey-def.cc +++ b/lily/newkey-def.cc @@ -1,51 +0,0 @@ -/* - newkey-def.cc -- implement Newkey_def - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ - -#include "newkey-def.hh" -#include "misc.hh" - - -Newkey_def::Newkey_def() -{ - pitch_alist_ = SCM_EOL; -} - -void -Newkey_def::transpose (Musical_pitch p) -{ - SCM newlist = SCM_EOL; - for (SCM s = pitch_alist_; gh_pair_p (s); s = gh_cdr (s)) - { - SCM k = gh_caar (s); - - if (gh_pair_p (k)) - { - Musical_pitch orig (gh_list (gh_car (k), gh_cdr (k), gh_cdr (s), SCM_UNDEFINED)); - - orig.transpose (p); - - SCM key = gh_cons (gh_int2scm (orig.octave_i_), - gh_int2scm (orig.notename_i_)); - - newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)), - newlist); - } - else if (gh_number_p (k)) - { - Musical_pitch orig (gh_list (gh_int2scm (0), k, gh_cdar (s), SCM_UNDEFINED)); - orig.transpose (p); - - SCM key =gh_int2scm (orig.notename_i_); - newlist = gh_cons (gh_cons (key, gh_int2scm (orig.accidental_i_)), - newlist); - } - } - - pitch_alist_ = newlist; -} diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 92e5180e11..97b542168b 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -153,17 +153,17 @@ Paper_outputter::output_scope (Scope *scope, String prefix) { SCM k = gh_caar (s); SCM v = gh_cdar (s); - - Identifier * id = unsmob_identifier (v); String s = ly_symbol2string (k); - if (dynamic_cast (id)) + + if (gh_string_p (v)) { - String val = *id->access_content_String (false); - - output_String_def (prefix + s, val); + output_String_def (prefix + s, ly_scm2string (v)); } - else if(dynamic_cast (id)) + + Identifier * id = unsmob_identifier (v); + + if(dynamic_cast (id)) { Real val = *id->access_content_Real (false); diff --git a/lily/parser.yy b/lily/parser.yy index 69be37c7e2..e7d2361273 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -198,13 +198,14 @@ yylex (YYSTYPE *s, void * v_l) %token MUSIC_IDENTIFIER %token REQUEST_IDENTIFIER %token REAL_IDENTIFIER -%token STRING_IDENTIFIER %token TRANS_IDENTIFIER %token INT_IDENTIFIER %token SCORE_IDENTIFIER %token MIDI_IDENTIFIER %token PAPER_IDENTIFIER %token REAL + +%token STRING_IDENTIFIER SCM_IDENTIFIER %token DURATION RESTNAME %token STRING %token SCM_T @@ -222,7 +223,8 @@ yylex (YYSTYPE *s, void * v_l) %type int unsigned %type script_dir -%type identifier_init +%type identifier_init + %type steno_duration optional_notemode_duration %type entered_notemode_duration explicit_duration %type int_list @@ -291,12 +293,12 @@ toplevel_expression: | paper_block { Identifier * id = new Paper_def_identifier ($1, PAPER_IDENTIFIER); - THIS->lexer_p_->set_identifier ("$defaultpaper", id) + THIS->lexer_p_->set_identifier ("$defaultpaper", smobify (id)) } | midi_block { Identifier * id = new Midi_def_identifier ($1, MIDI_IDENTIFIER); - THIS->lexer_p_->set_identifier ("$defaultmidi", id) + THIS->lexer_p_->set_identifier ("$defaultmidi", smobify (id)) } | embedded_scm { // junk value @@ -305,6 +307,7 @@ toplevel_expression: embedded_scm: SCM_T + | SCM_IDENTIFIER ; @@ -363,7 +366,9 @@ assignment: /* cont */ '=' identifier_init { THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4); - $4->set_spot (THIS->pop_spot ()); + Identifier * id =unsmob_identifier ($4); + Input spot = THIS->pop_spot (); + if (id) id->set_spot (spot); } ; @@ -371,37 +376,40 @@ assignment: identifier_init: score_block { - $$ = new Score_identifier ($1, SCORE_IDENTIFIER); - + $$ = smobify (new Score_identifier ($1, SCORE_IDENTIFIER)); + } | paper_block { - $$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER); + $$ = smobify (new Paper_def_identifier ($1, PAPER_IDENTIFIER)); } | midi_block { - $$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER); + $$ = smobify (new Midi_def_identifier ($1, MIDI_IDENTIFIER)); } | translator_spec_block { - $$ = new Translator_group_identifier ($1, TRANS_IDENTIFIER); + $$ = smobify (new Translator_group_identifier ($1, TRANS_IDENTIFIER)); } | Music { - $$ = new Music_identifier ($1, MUSIC_IDENTIFIER); + $$ = smobify (new Music_identifier ($1, MUSIC_IDENTIFIER)); } | post_request { - $$ = new Request_identifier ($1, REQUEST_IDENTIFIER); + $$ = smobify (new Request_identifier ($1, REQUEST_IDENTIFIER)); } | explicit_duration { - $$ = new Duration_identifier ($1, DURATION_IDENTIFIER); + $$ = smobify (new Duration_identifier ($1, DURATION_IDENTIFIER)); } | real { - $$ = new Real_identifier (new Real ($1), REAL_IDENTIFIER); + $$ = smobify (new Real_identifier (new Real ($1), REAL_IDENTIFIER)); } | string { - $$ = new String_identifier (new String (ly_scm2string ($1)), STRING_IDENTIFIER); + $$ = $1; } | int { - $$ = new int_identifier (new int ($1), INT_IDENTIFIER); + $$ = smobify (new int_identifier (new int ($1), INT_IDENTIFIER)); + } + | embedded_scm { + $$ = $1; } ; @@ -433,19 +441,21 @@ translator_spec_body: tg->set_property (ly_scm2string ($2), $4); } | translator_spec_body STRING '=' identifier_init semicolon { - Identifier* id = $4; - String_identifier *s = dynamic_cast (id); + Identifier* id = unsmob_identifier ($4); + Real_identifier *r= dynamic_cast(id); int_identifier *i = dynamic_cast (id); - + SCM v; - if (s) v = ly_str02scm (s->access_content_String (false)->ch_C()); - if (i) v = gh_int2scm (*i->access_content_int (false)); - if (r) v = gh_double2scm (*r->access_content_Real (false)); - if (!s && !i && !r) + if (gh_string_p ($4)) + v = $4; + else if (i) v = gh_int2scm (*i->access_content_int (false)); + else if (r) v = gh_double2scm (*r->access_content_Real (false)); + else THIS->parser_error (_("Wrong type for property value")); - delete $4; + if (id) + delete id; /* ugh*/ Translator_group* tg = dynamic_cast ($$); @@ -479,7 +489,7 @@ score_block: if (!$$->def_p_arr_.size ()) { Identifier *id = - THIS->lexer_p_->lookup_identifier ("$defaultpaper"); + unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); $$->add_output (id ? id->access_content_Paper_def (true) : new Paper_def ); } } @@ -528,7 +538,7 @@ paper_block: paper_def_body: /* empty */ { - Identifier *id = THIS->lexer_p_->lookup_identifier ("$defaultpaper"); + Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); Paper_def *p = id ? id->access_content_Paper_def (true) : new Paper_def; THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_); $$ = p; @@ -614,7 +624,7 @@ midi_block: ; midi_body: /* empty */ { - Identifier *id = THIS->lexer_p_->lookup_identifier ("$defaultmidi"); + Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultmidi")); Midi_def* p = id ? id->access_content_Midi_def (true) : new Midi_def ; @@ -1003,18 +1013,26 @@ verbose_command_req: } | KEY { Key_change_req *key_p= new Key_change_req; - key_p->key_ = 0; $$ = key_p; } /* TODO: Support for minor/major keys; make `major-scale' settable. + +FIXME: force modality. */ +/* | KEY NOTENAME_PITCH { Key_change_req *key_p= new Key_change_req; - key_p->key_ = new Newkey_def; - key_p->key_->pitch_alist_ = scm_eval (ly_symbol2scm ("major-scale")); - key_p->key_->transpose (* $2); + key_p->pitch_alist_ = scm_eval (ly_symbol2scm ("major-scale")); + $$ = key_p; + } +*/ + | KEY NOTENAME_PITCH SCM_IDENTIFIER { + Key_change_req *key_p= new Key_change_req; + + key_p->pitch_alist_ = $3; + ((Music* )key_p)->transpose (* $2); $$ = key_p; } ; @@ -1040,9 +1058,11 @@ request_that_take_dir: gen_text_def | verbose_request | script_abbreviation { - Identifier*i = THIS->lexer_p_->lookup_identifier ("dash-" + ly_scm2string ($1)); + SCM s = THIS->lexer_p_->lookup_identifier ("dash-" + ly_scm2string ($1)); Articulation_req *a = new Articulation_req; - a->articulation_str_ = *i->access_content_String (false); + if (gh_string_p (s)) + a->articulation_str_ = ly_scm2string (s); + else THIS->parser_error (_ ("Expecting string as script definition")); $$ = a; } ; @@ -1583,7 +1603,7 @@ string: $$ = $1; } | STRING_IDENTIFIER { - $$ = ly_str02scm ($1->access_content_String (true)->ch_C ()); + $$ = $1; } | string '+' string { $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED)); diff --git a/lily/scope.cc b/lily/scope.cc index 4a27d3ce46..96d1b86d33 100644 --- a/lily/scope.cc +++ b/lily/scope.cc @@ -53,12 +53,31 @@ Scope::elem (SCM s)const { return unsmob_identifier (id_dict_->get (s)); } + +SCM +Scope::scm_elem (SCM s)const +{ + return id_dict_->get (s); +} + +SCM +Scope::scm_elem (String s) const +{ + return scm_elem (ly_symbol2scm (s.ch_C())); +} + Identifier* Scope::elem (String s)const { return elem (ly_symbol2scm (s.ch_C())); } +void +Scope::set (String s, SCM id) +{ + return id_dict_->set (ly_symbol2scm (s.ch_C()), id); +} + void Scope::set (String s, Identifier * id) { diff --git a/lily/score-element.cc b/lily/score-element.cc index f54699f630..906c4c5a96 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -90,8 +90,11 @@ Score_element::Score_element (Score_element const&s) Score_element::~Score_element() { // this goes awry when score-elements are copied... - // real weird Paper_column::~Paper_column () -> infinity_mom - // unsmobify_self (); + + /* + Kijk goed naar hoe smobify en unsmobify werken. unsmobify_self + is te gebruiken wanneer C++ geheugen beheer weer overneemt van + GUILE. --hwn */ } diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index d5c12324ca..cf792a4408 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index 09c7f6601d..95abb1a0c6 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly"; diff --git a/ly/catalan.ly b/ly/catalan.ly index d8545e00a4..2d3d5238c5 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -71,4 +71,4 @@ -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 32688fd45a..6253a5330c 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index e08c2114bc..887ac83a4e 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/declarations-as.ly b/ly/declarations-as.ly index ccf8db4a43..fe4d71c552 100644 --- a/ly/declarations-as.ly +++ b/ly/declarations-as.ly @@ -1,4 +1,8 @@ - + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% UGH UGH UGH UGHUGH FIXME +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -> duplication! + + breve = \duration { -1 0 } longa = \duration { -2 0 } maxima = \duration { -3 0 } @@ -24,17 +28,8 @@ center=0 break = \penalty -1000000; nobreak = \penalty 1000000; +\include "scales.ly" -major = 0 -minor = 3 - -ionian = 0 -locrian = 1 -aeolian = 3 -mixolydian = 5 -lydian = 7 -phrygian = 8 -dorian = 10 melisma = \property Staff.melismaBusy = ##t melismaEnd = \property Staff.melismaBusy = ##f diff --git a/ly/declarations.ly b/ly/declarations.ly index d6c0930ea8..c113cfec3c 100644 --- a/ly/declarations.ly +++ b/ly/declarations.ly @@ -25,17 +25,7 @@ center=0 break = \penalty -1000000; nobreak = \penalty 1000000; - -major = 0 -minor = 3 - -ionian = 0 -locrian = 1 -aeolian = 3 -mixolydian = 5 -lydian = 7 -phrygian = 8 -dorian = 10 +\include "scales.ly" melisma = \property Staff.melismaBusy = ##t melismaEnd = \property Staff.melismaBusy = ##f diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 04effbdb3d..5a4beb4e0c 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/english.ly b/ly/english.ly index 1a611b9d08..50042bb52b 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -77,5 +77,5 @@ (bss . ( -1 6 2 )) ) -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/fragment.ly b/ly/fragment.ly index ca24d7eb51..43b2b15806 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly" diff --git a/ly/init-as.ly b/ly/init-as.ly index 923aa1ba6b..ce7099b426 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations-as.ly" diff --git a/ly/init.ly b/ly/init.ly index 04c15677b7..27c3fa6612 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.42"; +\version "1.3.59"; \include "declarations.ly"; diff --git a/ly/italiano.ly b/ly/italiano.ly index e3752a9319..9a5a262012 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ( -1 6 2 )) } -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/key.ly b/ly/key.ly new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/ly/key.ly @@ -0,0 +1 @@ + diff --git a/ly/norsk.ly b/ly/norsk.ly index f8e622086a..3a2f27e4dd 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -104,4 +104,4 @@ -\version "1.3.42"; +\version "1.3.59"; diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index edbbdf23f6..60e4168474 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,6 +1,6 @@ % paper-as5.ly -\version "1.3.42"; +\version "1.3.59"; paper_as_five = \paper { staffheight = 5.\char; diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 6e44c78abb..4f34c73c75 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,6 +1,6 @@ % paper-as9.ly -\version "1.3.42"; +\version "1.3.59"; paper_as_nine = \paper { staffheight = 9.\char; diff --git a/ly/paper16.ly b/ly/paper16.ly index c098eb0bb4..4b25071532 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -2,7 +2,7 @@ -\version "1.3.42"; +\version "1.3.59"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/ly/paper20.ly b/ly/paper20.ly index c3bade0b38..57848f8d1e 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.3.42"; +\version "1.3.59"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/paper23.ly b/ly/paper23.ly index efa2d33107..30f640ee06 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,7 +1,7 @@ % paper23.ly -\version "1.3.42"; +\version "1.3.59"; paper_twentythree = \paper { staffheight = 23.0\pt; diff --git a/ly/property.ly b/ly/property.ly index b3fd74191a..cfed38993a 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS. %} -\version "1.3.42"; +\version "1.3.59"; %hmm, (these) abbrevs suck, imo % i guess they're meant as some form of doco diff --git a/ly/scales.ly b/ly/scales.ly new file mode 100644 index 0000000000..873f58313b --- /dev/null +++ b/ly/scales.ly @@ -0,0 +1,32 @@ + + +major = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . 0) + + ) +minor = #'( + (0 . 0) + (1 . 0) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . -1) + (6 . -1) + ) + + +%{ OUTDATED: someone please fix these +ionian = 0 +locrian = 1 +aeolian = 3 +mixolydian = 5 +lydian = 7 +phrygian = 8 +dorian = 10 +%} diff --git a/ly/svenska.ly b/ly/svenska.ly index 2c18b3d686..e25ade6934 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ( -1 6 1 )) (hississ . ( -1 6 2 )) ) -\version "1.3.42"; +\version "1.3.59"; diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 313d5db9dc..36373fbade 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.59 -Entered-date: 12JUN00 +Version: 1.3.60 +Entered-date: 16JUN00 Description: 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.3.59.tar.gz + 1000k lilypond-1.3.60.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.59.tar.gz + 1000k lilypond-1.3.60.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 564575c68c..5599000b33 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.59 +Version: 1.3.60 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.59.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.60.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index 2e432c85c3..2a124a83ec 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index ddac5c36aa..23feeb7db4 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 5e1a2db34a..bce020e355 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" @@ -24,7 +24,7 @@ $clarinetti_staff = \context Staff = clarinetti < %\notes \context Voice=clarinetti < \notes \context Staff=clarinetti < \time 4/4; - \key f; + \key f \major; \skip 1*341; \bar "|."; \context VoiceOne=clarinettoi \$clarinetto1 diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 8e55f54f4b..67ea94f751 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; clarinetto1 = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 5699d11076..ae92af6fbb 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; clarinetto2 = \notes \relative c { R1*2 bes''4-.\ff r r2 | diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly index 35e2ab0045..46eea2f6cf 100644 --- a/mutopia/Coriolan/contrabasso-part.ly +++ b/mutopia/Coriolan/contrabasso-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "contrabasso.ly" diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 6001098b52..4b53586a6d 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; contrabasso = \notes \relative c { % \translator Staff=violoncello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 67d127646d..126cfaa4e6 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -8,7 +8,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "paper16.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 404e0178e5..ba5c9ffae8 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 470f00c463..4c83ed3fb3 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 1313558389..88a280a0df 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; corno1 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index f04d8fdb93..b141ebdd29 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; corno2 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index d9228f5b10..ac33ccedfd 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 5e10487759..e544773c3c 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 30d77e9953..4aba1af595 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; fagotto1 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 54b9a9d5ea..46e20bd21c 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; fagotto2 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index 5b93e92dd4..64c15a8d61 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 4e3e991a65..4de0fdd353 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 589c0e53d8..fa500b659c 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; flauto1 = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index bb150d5b87..4dcfbd0eac 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -6,7 +6,7 @@ composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; flauto2 = \notes \relative c { R1 *2 | as'''4-.\ff r r2 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 3c1799526a..6cc38edca0 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -9,11 +9,11 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; global = \notes { \time 4/4; - \key es; + \key es \major; \skip 1*314; \bar "|."; } diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index ab1ede99f1..aa4ce8c21a 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; oboe1 = \notes \relative c'' { R1*2 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index dead69de2e..bbdeb2634a 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; oboe2 = \notes \relative c{ R1*2| diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 27dd5295fe..f217a8e852 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 75f4c8962b..a6814311b4 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index ac21d1281a..49541e048d 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 576e6da21e..72876e2ab9 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; timpani = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 6bd558eecd..fe127d7bef 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 34fd0f5680..f8a5b7669a 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 6770593652..dbb308534a 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; trombo1 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 65801e02d4..2d4396247e 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; trombo2 = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index fa89bff6e4..7ab497ebae 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; viola1 = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index d9be550c73..34c94b537f 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; viola2 = \notes \relative c { % starts on (actualy, most part is on) same staff as viola1 diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly index fc9712f64d..d0a900cb3c 100644 --- a/mutopia/Coriolan/viola-part.ly +++ b/mutopia/Coriolan/viola-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index dead91e2c4..1782486f72 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index fe8bcc17a2..76cc3ff3ba 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; violino1 = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index 717263d665..1805dd62ec 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index c2ed90d964..a73e30da1a 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; violino2 = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index 5f9bf94ae7..221ea9cc33 100644 --- a/mutopia/Coriolan/violoncello-part.ly +++ b/mutopia/Coriolan/violoncello-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 56a09f2345..8d20f1198c 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; violoncello = \notes \relative c { c1\ff ~ | diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly index 13df9f73f7..82f56b6512 100644 --- a/mutopia/D.Zipoli/verso_2.ly +++ b/mutopia/D.Zipoli/verso_2.ly @@ -17,7 +17,7 @@ title = "Verso II"; under the Gnu Public Licence. %} -\version "1.3.42"; +\version "1.3.59"; $voice_one = \notes \relative c' { a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index 71fb470337..f3a510c59b 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -11,7 +11,7 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.3.42"; +\version "1.3.59"; global = \notes { \key a \minor; diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index e542fcf9c1..f7360334e4 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,7 +12,7 @@ Tested Features: %} -\version "1.3.42"; +\version "1.3.59"; \include "nederlands.ly" diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly index 803a7d9484..92135491c0 100644 --- a/mutopia/F.Schubert/standchen-16.ly +++ b/mutopia/F.Schubert/standchen-16.ly @@ -9,6 +9,6 @@ description = "A schubert song in 16 pt"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "standchen.ly" diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly index 2431ec2414..6e8b094129 100644 --- a/mutopia/F.Schubert/standchen-20.ly +++ b/mutopia/F.Schubert/standchen-20.ly @@ -10,7 +10,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.42"; +\version "1.3.59"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index 1e334f5783..a7025e113d 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -41,7 +41,7 @@ multiple \paper{}s in one \score Note: Original key f. %} -\version "1.3.42"; +\version "1.3.59"; vocalVerse = \notes\relative c''{ \property Voice.dynamicDirection=\up @@ -328,7 +328,7 @@ bassThrough = \notes\relative c{ global = \notes{ \time 3/4; - \key es; + \key es \major; \skip 4 * 12; \break \skip 4 * 234; diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index 8928666b3f..e010b894aa 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -7,7 +7,7 @@ metre = "6 6. 8 6. D"; } -\version "1.3.42"; +\version "1.3.59"; sop=\notes \transpose c''{ ees2 ees4 ees4 g2 g2 | c'1. @@ -57,7 +57,7 @@ bass=\notes \transpose c' { global = \notes{ \time 4/2; - \key ees; + \key ees \major; \skip 2*4; \skip 1.; \bar "||"; \skip 2; \skip 2*4; \skip 1.; \bar "||";\break \skip 2; \skip 2*12;\skip 1.; \bar "||";\break diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly index 589c8b63b4..bb01415976 100644 --- a/mutopia/Hymns/laudatedom.ly +++ b/mutopia/Hymns/laudatedom.ly @@ -4,7 +4,7 @@ composer = "Parry"; metre = "10 10 . 11 11"; } -\version "1.3.42"; +\version "1.3.59"; sop = \notes \transpose c''{ f4 | d' bes c' | f2 \bar "||"; @@ -53,7 +53,7 @@ bass = \notes \transpose c'{ global = \notes { \time 3/4; \partial 4; - \key bes; + \key bes \major; } \score { diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly index 4e0aea2199..dd9eb31971 100644 --- a/mutopia/Hymns/maccabaeus.ly +++ b/mutopia/Hymns/maccabaeus.ly @@ -7,7 +7,7 @@ title = "Maccabaeus"; metre = "10 11. 11 11. and refrain"; } -\version "1.3.42"; +\version "1.3.59"; sop=\notes \relative c'' { b2 gis4. a8 |b2 e,2 | @@ -78,7 +78,7 @@ bass=\notes \relative c { global = \notes { \time 2/2; \property Staff.timeSignatureStyle = "C" - \key e; + \key e \major; } $upper_staff = \context Staff = upper { diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index fc4735dcd7..fabe4073af 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -7,7 +7,7 @@ metre = "8 7 8 7 D"; } -\version "1.3.42"; +\version "1.3.59"; sop=\notes \relative c'' { b4 b c d | d c b a | g g a b | b4. a8 a2 | @@ -41,7 +41,7 @@ bass= \notes \relative c' { global=\notes{ \time 4/4; \property Staff.timeSignatureStyle="C" - \key g; + \key g \major; \skip 1*4; \bar "||"; \skip 1*4; \bar "||"; \skip 1*4; \bar "||"; diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly index 0b41a2d486..8e706d195b 100644 --- a/mutopia/Hymns/stille.ly +++ b/mutopia/Hymns/stille.ly @@ -8,7 +8,7 @@ } -\version "1.3.42"; +\version "1.3.59"; %{ Note: there are other verses, but the three here seem to be @@ -18,7 +18,7 @@ global=\notes { \time 6/4; - \key bes; + \key bes \major; \skip 1.*12; \bar "|."; } diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly index d1ac8a9ec5..e88e4afdb7 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,12 +4,12 @@ piece = "Allemande"; } -\version "1.3.42"; +\version "1.3.59"; global = \notes{ \time 4/4; \partial 8*3; - \key es; + \key es \major; \skip 1*15; \skip 4*3; \skip 16*4; diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly index ca85c32dde..a279987a65 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,11 +10,11 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.3.42"; +\version "1.3.59"; global = \notes{ \time 2/4; - \key es; + \key es \major; s2*48 \bar ":|:"; s2*48 diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index 037146d7b5..c31dcbc275 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,11 +10,11 @@ copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; global = \notes { \time 4/4; - \key es; + \key es \major; \skip 1*7; \bar "||"; \skip 1*22; diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index 3f8948524f..ca0b53a981 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,6 +1,6 @@ -\version "1.3.42"; +\version "1.3.59"; $global_i = \notes{ \time 12/8; - \key g; + \key g \major; } diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index 4c1f3080aa..cc165b65bb 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,4 +1,4 @@ -\version "1.3.42"; +\version "1.3.59"; $global_ii = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index 552deed2f0..cdb9ef96e1 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global-i.ly" \include "violoncello-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index 868bcf2475..4d10562208 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; \include "global-ii.ly" \include "violoncello-ii.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index 2181cdf549..e1479f2403 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 396a043f4c..1bbdb808ac 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; $violino_i = \notes\relative c'' { \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 5cfc445189..28c9e6cb21 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; $violino_ii = \notes\relative c''{ R1*8 | @@ -101,4 +101,4 @@ $violino_ii_staff = \context Staff = violino < \$violino_ii \$global_ii > -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index c2e417bd0e..3156a1b6ed 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 1d8068455e..0d42aab083 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index e194b469ad..56b3a279ff 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index 6a420c3e0b..00237bce7c 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; $violoncello_i = \notes\relative c{ \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index 191e097e7e..b8d32cb81f 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; $violoncello_ii = \notes\relative c{ r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis| diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index b290408a20..59b8371d21 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.42"; +\version "1.3.59"; % { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 7d0341b60d..b2e65c266b 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -44,7 +44,7 @@ Lemoine puts fermatas on ending bar lines everywhere. -\version "1.3.42"; +\version "1.3.59"; lowstaff = \translator "Staff" = "lower" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 599c21b2d1..530557f9d1 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -42,7 +42,7 @@ Old versions of LilyPond include this prelude with dynamics and fingerings. -\version "1.3.42"; +\version "1.3.59"; upper = \context Staff \notes\relative c{ \context Voice=i \property Voice . textStyle = "italic" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 0e5eed7da5..40145117bd 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -45,7 +45,7 @@ note, some have dotted half notes. %} -\version "1.3.42"; +\version "1.3.59"; upper = \notes \transpose c'' { @@ -162,7 +162,7 @@ lower = \notes{ global = \notes{ \time 3/4; - \key es; + \key es \major; } \score{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 7c09bc86c7..4b12ff5ee5 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -31,7 +31,7 @@ } -\version "1.3.42"; +\version "1.3.59"; upper = \context Staff \notes\relative c \context Voice=i { @@ -201,7 +201,7 @@ lower = \context Staff \notes\relative c{ global = \notes{ \time 3/4; - \key f; + \key f \major; } \score{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index fe112bdd32..ddb0f635f6 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -31,7 +31,7 @@ } -\version "1.3.42"; +\version "1.3.59"; @@ -124,7 +124,7 @@ four = \context Staff \notes\relative c{ global = \notes{ \time 4/4; - \key f; + \key f \major; } \score{ diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index 1fead8ac0b..c117c81428 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -1,12 +1,12 @@ -\version "1.3.42"; +\version "1.3.59"; \include "allemande-urtext.ly"; allemande_cello_global = \notes{ \time 4/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \partial 16; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 1076affa1d..39788eb40f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -99,4 +99,4 @@ allemande = \context Staff \notes< > -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly index 0e1ffaa596..3bb73dc71d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -1,11 +1,11 @@ -\version "1.3.42"; +\version "1.3.59"; \include "allemande-urtext.ly"; allemande_viola_global = \notes{ \time 4/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \partial 16; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index e4aeb50c91..53aa6f0309 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -1,11 +1,11 @@ -\version "1.3.42"; +\version "1.3.59"; \include "courante-urtext.ly"; courante_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \partial 16; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index a3fcd4d70b..0d27d057dd 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -88,4 +88,4 @@ courante = \context Staff \notes< \$courante_b > -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly index 3b901141ef..5bb63c9c8f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "courante-urtext.ly"; courante_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \partial 16; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 0c58fe97f2..0cab683945 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "gigue-urtext.ly"; gigue_cello_global = \notes{ \time 3/8; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \partial 8; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index fd68404719..6cf2f6f46e 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -102,4 +102,4 @@ gigue = \notes< \$gigue_b > -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index 777524b132..e988b49cba 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -1,12 +1,12 @@ -\version "1.3.42"; +\version "1.3.59"; \include "gigue-urtext.ly"; gigue_viola_global = \notes{ \time 3/8; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \partial 8; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index d656bbc05c..ea3b68ee7c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "menuetto-urtext.ly"; menuetto_i_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { \skip 2.*8; @@ -64,7 +64,7 @@ menuetto_i_cello_staff = \context Staff < menuetto_ii_cello_global = \notes{ \time 3/4; - \key d; + \key d \major; \clef bass; \repeat "volta" 2 { \skip 2.*8; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 2fa2d5dc0e..8c717afbb1 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -148,4 +148,4 @@ menuetto_ii = \context Staff\notes \relative c { d2. } -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index 3c166c43bb..61d0ebc254 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "menuetto-urtext.ly"; menuetto_i_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { \skip 2.*8; @@ -64,7 +64,7 @@ menuetto_i_viola_staff = \context Staff < menuetto_ii_viola_global = \notes{ \time 3/4; - \key d; + \key d \major; \clef alto; \repeat "volta" 2 { \skip 2.*8; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index 3679938668..82cb02b163 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "prelude-urtext.ly"; prelude_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \skip 2.*63; \bar "|."; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index 833c019696..7a971639f2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -194,4 +194,4 @@ prelude = \context Staff \notes< \$prelude_b > -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly index 9de8497143..894a1ca908 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "prelude-urtext.ly"; prelude_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \skip 2.*63; \bar "|."; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index d3e8a6b449..1b3cb39228 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -1,13 +1,13 @@ -\version "1.3.42"; +\version "1.3.59"; \include "sarabande-urtext.ly"; sarabande_cello_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef bass; \repeat "volta" 2 { s2.*12 diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 714a945536..3a5656491d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -89,4 +89,4 @@ sarabande = \context Staff \notes< \$sarabande_b > -\version "1.3.42"; +\version "1.3.59"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly index 63a0fcd712..897411cb12 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -1,10 +1,10 @@ -\version "1.3.42"; +\version "1.3.59"; \include "sarabande-urtext.ly"; sarabande_viola_global = \notes{ \time 3/4; - \key f; + \key f \major; \clef alto; \repeat "volta" 2 { s2.*12 diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 47a19d4b23..a62fc09853 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -19,7 +19,7 @@ enteredby = "Shay Rojansky"; %{ TODO: use autobeaming. %} -\version "1.3.42"; +\version "1.3.59"; tenor = diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 0eaea58b38..fe76c48871 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -21,7 +21,7 @@ % It would be nice to squeeze this onto two pages, but I am not sure % if it would work with US paper. -\version "1.3.42"; +\version "1.3.59"; dux = \context Voice=two \notes \relative c''{ @@ -164,15 +164,15 @@ bassdux = \context Voice=three \notes \relative c' { \notes \context PianoStaff < \context Staff = treble < -% \key c \minor; - \key es; + \key c \minor; +% \key es \major; \dux { \comes \bar "|."; } \time 4/4; \property Score.timeSignatureStyle = "C" > \context Staff = bass < - \key es;% \key c \minor; + \key c \minor; \bassdux > > diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index c4562082b2..4d4ae50369 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -15,7 +15,7 @@ enteredby = "Shay Rojansky"; lastupdated = "1999/Oct/14"; } -\version "1.3.42"; +\version "1.3.59"; % should do programmable input. soprane = diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index 567669efb3..595bf6afd4 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.3.42"; +\version "1.3.59"; global = \notes { \property StaffGroup.timeSignatureStyle = "old" @@ -231,45 +231,45 @@ bc=\context Staff = bc < \repeat "volta" 2 { - G2 d^"4 3" | G1 | - g2 c4 G | d1^"3 4 3" | - G1 | g2 c4 G | - d1^"3 4 3" | G | - g2 c4 d | G1^"3 4 3" | - c1 | c2 F4 c | - G1^"3 4 3" | c | - c2 F4 c | G1^"3 4 3" | - c2 G | g G | - c4 G d2^"3 4 3" | G g | + g,2 d^"4 3" | g,1 | + g2 c4 g, | d1^"3 4 3" | + g,1 | g2 c4 g, | + d1^"3 4 3" | g, | + g2 c4 d | g,1^"3 4 3" | + c1 | c2 f,4 c | + g,1^"3 4 3" | c | + c2 f,4 c | g,1^"3 4 3" | + c2 g, | g g, | + c4 g, d2^"3 4 3" | g, g | fis g | d1^"3 4 3" | - G2 B | d1^"3 4 3" | - G^"3 4 3" | c4 B c2 | - G1^"3 4 3" | c4 B c g | - c B c G | d1^"3 4 3" | - G1 | + g,2 b, | d1^"3 4 3" | + g,^"3 4 3" | c4 b, c2 | + g,1^"3 4 3" | c4 b, c g | + c b, c g, | d1^"3 4 3" | + g,1 | } \repeat "volta" 2 { g1. | c | f | d^"\\textsharp" | g | c | - A | d^"\\textsharp" | - G | c | + a, | d^"\\textsharp" | + g, | c | d^"\\textsharp" | e | - f | g1 B2 | + f | g1 b,2 | d1.^"3 4 3" | - G1 | + g,1 | } \repeat "volta" 2 { - g2 fis | g G | + g2 fis | g g, | g1^"3 4 3" | c | - G^"3 4 3" | c2 G | - d1^"3 4 3" | G^"3 4 3" | - c2 G | d1^"\\textsharp" ( | + g,^"3 4 3" | c2 g, | + d1^"3 4 3" | g,^"3 4 3" | + c2 g, | d1^"\\textsharp" ( | ) d^"3 4 3" | \cadenzaOn - G\breve + g,\breve } }> diff --git a/scm/lily.scm b/scm/lily.scm index ded3b1ff30..2b3d8b26c4 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -292,7 +292,8 @@ (define (end-output) (begin - (display (gc-stats)) +; uncomment for some stats about lily memory +; (display (gc-stats)) (string-append "\n\\EndLilyPondOutput" ; Put GC stats here. ))) diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index e55c4db7ce..d144bcc4f2 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -473,6 +473,13 @@ if 1: conversions.append ((1,3,49), conv, 'noteHeadStyle value: string -> symbol') +if 1: + def conv (str): + str = re.sub (r"""\\key *([a-z]+) *;""", r"""\\key \1 \major;""",str); + return str + conversions.append ((1,3,59), conv, + '\key X ; -> \key X major; ') + ############################ -- 2.39.2