From 899a5926b98860f3d5db399616d9211927fbfa3c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 13 Oct 2002 21:58:05 +0000 Subject: [PATCH] ly- -> ly: --- ChangeLog | 2 + Documentation/GNUmakefile | 2 +- Documentation/user/GNUmakefile | 2 +- Documentation/user/tutorial.itely | 5 +- input/ascii-art/standchen-as5.ly | 4 +- input/ascii-art/standchen-as9.ly | 4 +- input/les-nereides.ly | 12 +- .../E.Satie/petite-ouverture-a-danser.ly | 6 +- input/mutopia/F.Schubert/standchen.ly | 6 +- .../J.S.Bach/Petites-Preludes/preludes-4.ly | 6 +- .../J.S.Bach/baerenreiter-sarabande.ly | 10 +- input/mutopia/R.Schumann/romanze-op28-2.ly | 6 +- input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly | 6 +- input/no-notation/pc-direction.ly | 4 +- input/regression/GNUmakefile | 2 +- input/regression/accidental-octave.ly | 24 +- input/regression/accidental-voice.ly | 24 +- input/regression/accidentals.ly | 24 +- input/regression/auto-beam-tuplets.ly | 4 +- input/regression/collision-heads.ly | 2 +- input/regression/merge-differently-dotted.ly | 2 +- input/regression/molecule-hacking.ly | 20 +- input/regression/tuplet-nest.ly | 4 +- input/scarlatti-test.ly | 10 +- input/test/GNUmakefile | 2 +- input/test/ac-extra-voice.ly | 4 +- input/test/add-staccato.ly | 16 +- input/test/add-text-script.ly | 18 +- input/test/auto-beam-4-8.ly | 6 +- input/test/auto-beam-override.ly | 6 +- input/test/beam-count.ly | 4 +- input/test/broken-spanner-adjustment.ly | 8 +- input/test/coda-kludge.ly | 4 +- input/test/duration-check.ly | 12 +- input/test/explicit.ly | 6 +- input/test/extra-staff.ly | 2 +- input/test/move-accidentals.ly | 8 +- input/test/move-specific-text.ly | 4 +- input/test/music-box.ly | 36 +- input/test/music-creation.ly | 14 +- input/test/ottava.ly | 4 +- input/test/part-combine-moments.ly | 4 +- input/test/part-combine-score.ly | 4 +- input/test/part-combine-staff.ly | 4 +- input/test/reverse-music.ly | 16 +- input/test/scheme-interactions.ly | 4 +- input/test/slur-ugly.ly | 4 +- input/test/smart-transpose.ly | 26 +- input/test/text-spanner.ly | 18 +- input/test/timing.ly | 8 +- input/test/trill.ly | 6 +- input/test/tuplet-spanner-duration.ly | 4 +- input/test/voicify-chords.ly | 20 +- lily/duration.cc | 21 +- lily/event.cc | 4 +- lily/font-interface.cc | 4 +- lily/font-metric.cc | 6 +- lily/function-documentation.cc | 2 +- lily/grob-interface.cc | 4 +- lily/grob-pq-engraver.cc | 2 +- lily/grob-scheme.cc | 18 +- lily/grob.cc | 2 +- lily/identifier-smob.cc | 2 +- lily/input-file-results.cc | 2 +- lily/input-smob.cc | 4 +- lily/lily-guile.cc | 15 +- lily/lookup.cc | 2 +- lily/molecule.cc | 16 +- lily/moment.cc | 4 +- lily/music-iterator.cc | 2 +- lily/music.cc | 12 +- lily/parse-scm.cc | 2 +- lily/parser.yy | 4 +- lily/pitch.cc | 16 +- lily/scm-option.cc | 4 +- lily/script-column.cc | 2 +- lily/translator-ctors.cc | 2 +- lily/translator-scheme.cc | 4 +- lily/translator.cc | 4 +- ly/catalan.ly | 100 +++--- ly/chord-modifiers-init.ly | 16 +- ly/declarations-init.ly | 8 +- ly/deutsch.ly | 74 ++-- ly/dynamic-scripts-init.ly | 4 +- ly/english.ly | 142 ++++---- ly/engraver-init.ly | 4 +- ly/espanol.ly | 84 ++--- ly/generate-documentation.ly | 4 +- ly/generate-interface-doc-init.ly | 4 +- ly/grace-init.ly | 6 +- ly/italiano.ly | 72 ++-- ly/nederlands.ly | 80 ++--- ly/norsk.ly | 146 ++++---- ly/property-init.ly | 6 +- ly/script-init.ly | 3 + ly/spanners-init.ly | 12 +- ly/suomi.ly | 76 ++--- ly/svenska.ly | 72 ++-- scm/ascii-script.scm | 2 +- scm/auto-beam.scm | 66 ++-- scm/backend-documentation-lib.scm | 6 +- scm/bass-figure.scm | 44 +-- scm/c++.scm | 18 +- scm/chord-name.scm | 4 +- scm/clef.scm | 10 +- scm/drums.scm | 322 +++++++++--------- scm/engraver-documentation-lib.scm | 28 +- scm/font.scm | 2 +- scm/function-documentation.scm | 2 +- scm/generate-documentation.scm | 2 +- scm/grob-description.scm | 2 +- scm/grob-property-description.scm | 66 ++-- scm/interface-description.scm | 12 +- scm/lily.scm | 64 ++-- scm/midi.scm | 2 +- scm/molecule.scm | 34 +- scm/music-documentation-lib.scm | 4 +- scm/music-functions.scm | 158 ++++----- scm/music-property-description.scm | 16 +- scm/music-types.scm | 6 +- scm/output-lib.scm | 44 +-- scm/pdf.scm | 26 +- scm/pdftex.scm | 16 +- scm/ps.scm | 44 +-- scm/pysk.scm | 4 +- scm/sketch.scm | 24 +- scm/slur.scm | 26 +- scm/standalone.scm | 8 +- scm/tex.scm | 20 +- scm/to-xml.scm | 30 +- scm/translator-property-description.scm | 32 +- scripts/convert-ly.py | 41 ++- 132 files changed, 1383 insertions(+), 1338 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4e71ac089..0917334fc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-10-13 Han-Wen Nienhuys + * Use uniform ly: prefix for exported scheme primitive functions. + * scm/music-types.scm: junk compat glue * scripts/convert-ly.py: add rules for stuff below, junk diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 69aa4bfef4..d3786b49ac 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -4,7 +4,7 @@ NAME = documentation SUBDIRS=user bibliography pictures topdocs misc windows STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly -LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly-set-option (quote internal-type-checking) \#t)"' +LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' README_TOP_FILES=NEWS DEDICATION ChangeLog EXTRA_DIST_FILES= diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 559f9a60c4..08a901afd7 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -22,7 +22,7 @@ INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info) STEPMAKE_TEMPLATES=tex texinfo documentation LOCALSTEPMAKE_TEMPLATES=lilypond ly -LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly-set-option (quote internal-type-checking) \#t)"' +LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' include $(depth)/make/stepmake.make diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 00754151b4..31d0363008 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1903,7 +1903,10 @@ The purpose of this no-op is to protect it from being interpreted as relative notes. Relative mode can not be used together with transposition, so @code{\relative} will leave the contents of @code{\hoomPah} alone. We can use it without having to worry about -getting the motive in a wrong octave. +getting the motive in a wrong octave. Conversely, if you want to +transpose a fragment of music entered with @code{\relative}, then you +should make sure that @code{\transpose} comes before @code{\relative}. + @separate @cindex staff switch, manual @cindex cross staff voice, manual diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly index a3b4c072a8..8166300bd3 100644 --- a/input/ascii-art/standchen-as5.ly +++ b/input/ascii-art/standchen-as5.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" % ASCII Art output % % Process as: @@ -34,7 +34,7 @@ \VoiceContext % horizontal beams Beam \override #'height = #0 - autoBeamSettings \override #'(begin * * * *) = #(make-moment 0 1) + autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1) TextScript \set #'no-spacing-rods = ##t } } diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly index 84bc1a3b76..b97f3278a6 100644 --- a/input/ascii-art/standchen-as9.ly +++ b/input/ascii-art/standchen-as9.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" % ASCII Art output % Process as: @@ -34,7 +34,7 @@ \VoiceContext % horizontal beams Beam \override #'height = #0 - autoBeamSettings \override #'(begin * * * *) = #(make-moment 0 1) + autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1) TextScript \set #'no-spacing-rods = ##t } } diff --git a/input/les-nereides.ly b/input/les-nereides.ly index ce04d52dcb..cfe88880a2 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,4 +1,4 @@ -\version "1.7.2" +\version "1.7.3" \header { composer = "ARTHUR GRAY" @@ -10,11 +10,11 @@ description = "Nastiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf" } -#(set-point-and-click! 'line-column) +#(ly:set-point-and-click! 'line-column) #(set! point-and-click line-column-location) #(define (make-text-checker text) - (lambda (elt) (equal? text (ly-get-grob-property elt 'text)))) + (lambda (elt) (equal? text (ly:get-grob-property elt 'text)))) global = \notes{ \partial 2 @@ -85,7 +85,7 @@ treble = \context Voice=treble \notes\relative c''{ % currently, this can't be (small) italic, because in the paperblock % we set italic_magnifictation to get large italics. - cis''''4^"m.g."\arpeggio #(ly-export (make-span-event 'TextSpanEvent START)) ( + cis''''4^"m.g."\arpeggio #(ly:export (make-span-event 'TextSpanEvent START)) ( \property Voice.Stem \revert #'direction @@ -93,7 +93,7 @@ treble = \context Voice=treble \notes\relative c''{ )cis8 \property Voice.Stem \revert #'direction \property Voice.Stem \override #'direction = #0 - [a16-5( fis dis #(ly-export (make-span-event 'TextSpanEvent STOP)) ] + [a16-5( fis dis #(ly:export (make-span-event 'TextSpanEvent STOP)) ] \property Staff.centralCPosition = #-6 [cis32 a-1 fis-4 dis] [cis a )fis-2] @@ -313,7 +313,7 @@ lowerDynamics = \context Dynamics=lower \notes{ \translator { \ScoreContext TimeSignature \override #'style = #'C - %% SpacingSpanner \override #'maximum-duration-for-spacing = #(make-moment 1 4) + %% SpacingSpanner \override #'maximum-duration-for-spacing = #(ly:make-moment 1 4) \remove Bar_number_engraver } diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 92dae8b65c..5aeba75dff 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,7 +12,7 @@ Tested Features: %} -\version "1.5.68" +\version "1.7.3" \include "nederlands.ly" @@ -150,8 +150,8 @@ lower = \context Staff \notes \relative c{ \translator{ \VoiceContext Slur \override #'attachment = #'(stem . stem) - autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4) - autoBeamSettings \override #'(end 1 16 * *) = #(make-moment 1 4) + autoBeamSettings \override #'(end 1 8 * *) = #(ly:make-moment 1 4) + autoBeamSettings \override #'(end 1 16 * *) = #(ly:make-moment 1 4) } } \midi { diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 812702c86b..5056d97674 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -1,5 +1,5 @@ -#(set-point-and-click! 'line-column) +#(ly:set-point-and-click! 'line-column) instrument = "Piano" @@ -41,7 +41,7 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "1.5.72" +\version "1.7.3" dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction @@ -399,7 +399,7 @@ vocalStaff = \context Staff = vocal< treble = { \clef treble - \property Voice.autoBeamSettings \override #'(begin * * * *) = #(make-moment 0 1) + \property Voice.autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1) \trebleIntro \trebleVerseOne \trebleEentje diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 7fd814331a..daebc66841 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -1,9 +1,9 @@ -#(set-point-and-click! 'line-column) +#(ly:set-point-and-click! 'line-column) opus = "BWV 925" piece = "4" -\version "1.5.72" +\version "1.7.3" %{ @@ -218,7 +218,7 @@ global = \notes{ \translator{ \VoiceContext % consider ending beam at every 1 2 note - autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4) + autoBeamSettings \override #'(end 1 8 * *) = #(ly:make-moment 1 4) } } \midi{ \tempo 4 = 70 } diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index b216e0a170..7d5c25ca90 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,6 +1,6 @@ -\version "1.5.72" +\version "1.7.3" -#(set-point-and-click! 'line-column) +#(ly:set-point-and-click! 'line-column) forcedBreak = \notes { } %%forcedBreak = \notes { \break } @@ -10,9 +10,9 @@ forcedLastBreak = \notes { \break } %% We want this to perfectly match the Baerenreiter spacing. %% If we're not using 6 systems, there's definately a problem. #(define (assert-system-count smob n) - (let ((systems (length (get-broken-into - (get-original - (get-system smob)))))) + (let ((systems (length (ly:get-broken-into + (ly:get-original + (ly:get-system smob)))))) (if (not (equal? n systems)) (error ;;(warn diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 150b16a08f..526c0a2441 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -5,7 +5,7 @@ %% 19 is broken --hwn. %\include "paper19.ly" -\version "1.5.71" +\version "1.7.3" \header { title = "Romanzen" @@ -32,7 +32,7 @@ m = { ] \translator Staff = mid \stemUp [ } d = { \translator Staff = down \stemUp } global = \notes { \key fis \major \time 6/8 - \property Score.beatLength = #(make-moment 3 8) + \property Score.beatLength = #(ly:make-moment 3 8) \repeat volta 2 { s2.*8 } s2.*26 \bar "|." } @@ -263,7 +263,7 @@ leftb = \notes \transpose cis' { } \translator { \ScoreContext - SpacingSpanner \override #'common-shortest-duration = #(make-moment 1 8) + SpacingSpanner \override #'common-shortest-duration = #(ly:make-moment 1 8) } \translator { \PianoStaffContext diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index 3ef3d9eba8..e5e5555813 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly @@ -1,12 +1,12 @@ -% #(set-point-and-click! 'line-column) +% #(ly:set-point-and-click! 'line-column) longgrace = \property Voice.Stem \override #'stroke-style = #'() endlonggrace = \property Voice.Stem \revert #'stroke-style ritenuto = \textscript #'(italic "rit.") -\version "1.7.2" +\version "1.7.3" #(define italic-bf '((font-shape . italic) (font-series . bold))) @@ -22,7 +22,7 @@ ritenuto = \textscript #'(italic "rit.") (font-relative-size . 3))) cresc = \notes { - #(ly-export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) + #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) \property Voice.crescendoText = #`(,italic-bf "cresc.") \property Voice.crescendoSpanner = #'dashed-line } diff --git a/input/no-notation/pc-direction.ly b/input/no-notation/pc-direction.ly index 3586a94846..2d9c34569a 100644 --- a/input/no-notation/pc-direction.ly +++ b/input/no-notation/pc-direction.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" % move to regtest once it works? @@ -60,7 +60,7 @@ staffCombinePianoStaffProperties = { % the only way to tell the difference. \property PianoStaff.aDueText = #"\\`a2" \property PianoStaff.splitInterval = #'(1 . 0) - \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + \property PianoStaff.changeMoment = #`(,(ly:make-moment 1 1) . ,(ly:make-moment 1 1)) \property PianoStaff.noDirection = ##t } diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile index 540e72e923..7c395aed38 100644 --- a/input/regression/GNUmakefile +++ b/input/regression/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly-set-option (quote internal-type-checking) \#t)"' +LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' include $(depth)/make/stepmake.make TITLE=LilyPond Regression Tests diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index 4b115eeee2..965707a089 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc=" @@ -10,29 +10,29 @@ FIXME: Shorten and docu } #(define (lo-octave p) - (let* ((a (pitch-alteration p)) - (n (pitch-notename p))) - (make-pitch -1 n a))) + (let* ((a (ly:pitch-alteration p)) + (n (ly:pitch-notename p))) + (ly:make-pitch -1 n a))) #(define (no-octaves music) - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (p (ly-get-mus-property music 'pitch))) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (p (ly:get-mus-property music 'pitch))) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map no-octaves es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (no-octaves e))) - (if (pitch? p) + (if (ly:pitch? p) (begin (set! p (lo-octave p)) - (ly-set-mus-property! music 'pitch p))) + (ly:set-mus-property! music 'pitch p))) music)) diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 3daeea0377..1c95ad4760 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header{ texidoc=" @@ -10,29 +10,29 @@ The last f gets cautionary natural because fis was only in the other voice. } #(define (lo-octave p) - (let* ((a (pitch-alteration p)) - (n (pitch-notename p))) - (make-pitch -1 n a))) + (let* ((a (ly:pitch-alteration p)) + (n (ly:pitch-notename p))) + (ly:make-pitch -1 n a))) #(define (no-octaves music) - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (p (ly-get-mus-property music 'pitch))) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (p (ly:get-mus-property music 'pitch))) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map no-octaves es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (no-octaves e))) - (if (pitch? p) + (if (ly:pitch? p) (begin (set! p (lo-octave p)) - (ly-set-mus-property! music 'pitch p))) + (ly:set-mus-property! music 'pitch p))) music)) diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index caf8774fd1..6feda7a830 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header{ texidoc=" @@ -7,29 +7,29 @@ This shows how accidentals are handled. } #(define (lo-octave p) - (let* ((a (pitch-alteration p)) - (n (pitch-notename p))) - (make-pitch -1 n a))) + (let* ((a (ly:pitch-alteration p)) + (n (ly:pitch-notename p))) + (ly:make-pitch -1 n a))) #(define (no-octaves music) - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (p (ly-get-mus-property music 'pitch))) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (p (ly:get-mus-property music 'pitch))) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map no-octaves es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (no-octaves e))) - (if (pitch? p) + (if (ly:pitch? p) (begin (set! p (lo-octave p)) - (ly-set-mus-property! music 'pitch p))) + (ly:set-mus-property! music 'pitch p))) music)) diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index eecdbc166b..f1ace500bc 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on @@ -6,7 +6,7 @@ beams even if they're auto generated." } \score { \notes \relative c' { - \property Voice.tupletSpannerDuration = #(make-moment 1 4) + \property Voice.tupletSpannerDuration = #(ly:make-moment 1 4) \property Voice.TupletBracket \override #'bracket-visibility = #'if-no-beam \times 2/3 { [f8 f f ][f8 f f ] f f f f f f diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 38097fe74d..9918b72e7b 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc = diff --git a/input/regression/merge-differently-dotted.ly b/input/regression/merge-differently-dotted.ly index 78764b4d41..1629777943 100644 --- a/input/regression/merge-differently-dotted.ly +++ b/input/regression/merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc = "If NoteCollision has merge-differently-dotted set, note diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index 3ff3c6a685..9f35d9370f 100644 --- a/input/regression/molecule-hacking.ly +++ b/input/regression/molecule-hacking.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc=" You can write molecule callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is @@ -28,25 +28,25 @@ GROB. The dimensions of the molecule is not affected. " (let* ( - (fn (ly-get-default-font grob)) - (pclose (ly-find-glyph-by-name fn "accidentals-rightparen")) - (popen (ly-find-glyph-by-name fn "accidentals-leftparen")) + (fn (ly:get-default-font grob)) + (pclose (ly:find-glyph-by-name fn "accidentals-rightparen")) + (popen (ly:find-glyph-by-name fn "accidentals-leftparen")) (subject (callback grob)) ; remember old size - (subject-dim-x (ly-get-molecule-extent subject 0)) - (subject-dim-y (ly-get-molecule-extent subject 1)) + (subject-dim-x (ly:get-molecule-extent subject 0)) + (subject-dim-y (ly:get-molecule-extent subject 1)) ) ; add parens (set! subject - (ly-combine-molecule-at-edge - (ly-combine-molecule-at-edge subject 0 1 pclose 0.2) + (ly:combine-molecule-at-edge + (ly:combine-molecule-at-edge subject 0 1 pclose 0.2) 0 -1 popen 0.2)) ; revert old size. - (ly-set-molecule-extent! subject 0 subject-dim-x) - (ly-set-molecule-extent! subject 1 subject-dim-y) + (ly:set-molecule-extent! subject 0 subject-dim-x) + (ly:set-molecule-extent! subject 1 subject-dim-y) subject ) ) diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index dad954c4fa..124bfbecd4 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,11 +1,11 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc="Manual hack for nested tuplets, move outer tuplet up." } #(define (make-text-checker-once text) (lambda (grob) (and text-checker-once - (if (equal? text (ly-get-grob-property grob 'text)) + (if (equal? text (ly:get-grob-property grob 'text)) (begin (set! text-checker-once #f) #t) #f)))) diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly index 5fca8e9736..76d3dda0e3 100644 --- a/input/scarlatti-test.ly +++ b/input/scarlatti-test.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" %K000.ly LilyPond 1.2.16 \header { title="John's Scarlatti quotes" @@ -13,10 +13,10 @@ composer = "Domenico Scarlatti" \translator{\VoiceContext %% huh? %%beamAutoBegin=0 - autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 3 8) - autoBeamSettings \override #'(end 1 16 * *) = #(make-moment 3 8) - autoBeamSettings \override #'(end 1 24 * *) = #(make-moment 1 8) - autoBeamSettings \override #'(end 1 32 * *) = #(make-moment 1 8) + autoBeamSettings \override #'(end 1 8 * *) = #(ly:make-moment 3 8) + autoBeamSettings \override #'(end 1 16 * *) = #(ly:make-moment 3 8) + autoBeamSettings \override #'(end 1 24 * *) = #(ly:make-moment 1 8) + autoBeamSettings \override #'(end 1 32 * *) = #(ly:make-moment 1 8) } } diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile index e33a3600a5..12b6027686 100644 --- a/input/test/GNUmakefile +++ b/input/test/GNUmakefile @@ -4,7 +4,7 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly-set-option (quote internal-type-checking) \#t)"' +LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' ## Hmm, would this work? No -- if we really want examples, move ## to other dir (input/) comes to mind. diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index 1a526e0fd9..2f7c7a9bec 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -1,4 +1,4 @@ -\version "1.7.2" +\version "1.7.3" % % TODO: what's this? % @@ -65,7 +65,7 @@ accompany = \notes \relative c{ Slur \override #'direction = #1 - autoBeamSettings \override #'(end * * * *) = #(make-moment 1 2) + autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 2) } } \midi { diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index 15268357b4..caac177d2f 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -1,4 +1,4 @@ -\version "1.7.0" %% or actually: 1.7.1 ... +\version "1.7.3" %% or actually: 1.7.1 ... \header { texidoc= "Using make-music, you can add various stuff to notes. Here @@ -9,19 +9,19 @@ one would not use scm constructs. See separate-staccato.ly first." #(define (make-script x) (let ((m (make-music-by-name 'ArticulationEvent))) - (ly-set-mus-property! m 'articulation-type x) + (ly:set-mus-property! m 'articulation-type x) m)) #(define (add-script m x) - (if (equal? (ly-get-mus-property m 'name) 'RequestChord) - (ly-set-mus-property! m 'elements + (if (equal? (ly:get-mus-property m 'name) 'RequestChord) + (ly:set-mus-property! m 'elements (cons (make-script x) - (ly-get-mus-property m 'elements))) + (ly:get-mus-property m 'elements))) - (let ((es (ly-get-mus-property m 'elements)) - (e (ly-get-mus-property m 'element)) ) + (let ((es (ly:get-mus-property m 'elements)) + (e (ly:get-mus-property m 'element)) ) (map (lambda (y) (add-script y x)) es) - (if (music? e) + (if (ly:music? e) (add-script e x)))) m) diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index bec0a15910..a8f63b3e5a 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -1,4 +1,4 @@ -\version "1.7.0" %% or actually: 1.7.1 ... +\version "1.7.3" %% or actually: 1.7.1 ... \header { texidoc= "Using make-music, you can add various stuff to notes. Here is an example @@ -10,20 +10,20 @@ create, then write a function that will build the structure for you." #(define (make-text-script x) (let ((m (make-music-by-name 'TextScriptEvent))) - (ly-set-mus-property! m 'text-type 'finger) - (ly-set-mus-property! m 'text x) + (ly:set-mus-property! m 'text-type 'finger) + (ly:set-mus-property! m 'text x) m)) #(define (add-text-script m x) - (if (equal? (ly-music-name m) 'RequestChord) - (ly-set-mus-property! m 'elements + (if (equal? (ly:music-name m) 'RequestChord) + (ly:set-mus-property! m 'elements (cons (make-text-script x) - (ly-get-mus-property m 'elements))) + (ly:get-mus-property m 'elements))) - (let ((es (ly-get-mus-property m 'elements)) - (e (ly-get-mus-property m 'element)) ) + (let ((es (ly:get-mus-property m 'elements)) + (e (ly:get-mus-property m 'element)) ) (map (lambda (y) (add-text-script y x)) es) - (if (music? e) + (if (ly:music? e) (add-text-script e x)))) m) diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly index f431afaf9d..9d1b83892f 100644 --- a/input/test/auto-beam-4-8.ly +++ b/input/test/auto-beam-4-8.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" @@ -21,8 +21,8 @@ | | | |--| x| x| x| x| x| %} - %\property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 2 4) - \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 2 4) + %\property Voice.autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 2 4) + \property Voice.autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 2 4) c8 c c c16 c } diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly index cc1d32d0b4..8974fc4277 100644 --- a/input/test/auto-beam-override.ly +++ b/input/test/auto-beam-override.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" %{ Currently (1.1.27.jcn3), the auto-beam engraver will only engrave @@ -19,7 +19,7 @@ c8 c c c c16 c c c c c c c % from here on consider ending beam every 1/4 note - \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 1 4) + \property Voice.autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 4) c8 c c c % manually override autobeam with weird beaming c8 [c c] c @@ -34,7 +34,7 @@ \translator{ \VoiceContext % consider ending beam at every 1/2 note - autoBeamSettings \override #'(end * * * *) = #(make-moment 1 2) + autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 2) } } } diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index 285a912c80..ea6cf3e3d7 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -1,11 +1,11 @@ -\version "1.5.68" +\version "1.7.3" fragment = \notes { f'32 g a b b a g f \property Voice.autoBeamSettings - \set #'(end * * * *) = #(make-moment 1 4) + \set #'(end * * * *) = #(ly:make-moment 1 4) f32 g a b b a g f f32 g a diff --git a/input/test/broken-spanner-adjustment.ly b/input/test/broken-spanner-adjustment.ly index 7755b5c4ac..78dd08ee54 100644 --- a/input/test/broken-spanner-adjustment.ly +++ b/input/test/broken-spanner-adjustment.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc = "Broken spanners can be adjusted individually, but @@ -9,15 +9,15 @@ this requires complicated scheme code. #(define (my-callback grob) (let* ( - (o (get-original grob)) - (b (if (ly-grob? o) (get-broken-into o) '() )) + (o (ly:get-original grob)) + (b (if (ly:grob? o) (ly:get-broken-into o) '() )) ) ;; Call the equivalent of Tie::after_line_breaking ;; if you're using this for other grob-types. (if (and (>= (length b) 2) (eq? (car (last-pair b)) grob)) - (ly-set-grob-property! grob 'extra-offset '(4 . -2)) + (ly:set-grob-property! grob 'extra-offset '(4 . -2)) ) )) diff --git a/input/test/coda-kludge.ly b/input/test/coda-kludge.ly index 78eb1902b4..63f0853b1b 100644 --- a/input/test/coda-kludge.ly +++ b/input/test/coda-kludge.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" % The volta texts should read: 1-4 and 5 % Not 1 and 2 % (see 1.2.17) @@ -36,7 +36,7 @@ Hi, \context Staff \notes\relative c''{ c c c c % coda-klugde: let volta span only one bar - \property Staff.voltaSpannerDuration = #(make-moment 1 1) + \property Staff.voltaSpannerDuration = #(ly:make-moment 1 1) \repeat "volta" 5 { d d d d } \alternative { { e e e e f f f f } { g g g g } } diff --git a/input/test/duration-check.ly b/input/test/duration-check.ly index 62a44d3eab..8c86a032e0 100644 --- a/input/test/duration-check.ly +++ b/input/test/duration-check.ly @@ -1,11 +1,11 @@ -\version "1.5.68" +\version "1.7.3" #(define (duration-check music) "Check all rest durations in MUSIC" - (let* ((name (ly-music-name music)) - (elts (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (duration (ly-get-mus-property music 'duration))) + (let* ((name (ly:music-name music)) + (elts (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (duration (ly:get-mus-property music 'duration))) (if (not (equal? '() duration)) (begin @@ -26,7 +26,7 @@ (if (pair? elts) (map duration-check elts)) - (if (music? e) + (if (ly:music? e) (duration-check e))) music) diff --git a/input/test/explicit.ly b/input/test/explicit.ly index 1842339451..dd9ff03687 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -1,12 +1,12 @@ -\version "1.5.68" +\version "1.7.3" \header{ texidoc="Explicit pitches and durations." } \score { \notes { - \pitch #(make-pitch 0 0 0) \duration #(make-duration 1 0) - \pitch #(make-pitch 1 1 1) \duration #(make-duration 2 0) + \pitch #(ly:make-pitch 0 0 0) \duration #(ly:make-duration 1 0) + \pitch #(ly:make-pitch 1 1 1) \duration #(ly:make-duration 2 0) } } diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index dcce6a5847..2e9678463d 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" %{ (Message vers:9) To: Adrian Mariano diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly index 85482ba5cd..fb23ae361e 100644 --- a/input/test/move-accidentals.ly +++ b/input/test/move-accidentals.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc= "Positions of accidentals may be manually set. This @@ -9,9 +9,9 @@ involves some scheme code." (lambda (elt) (and (not (eq? #f (memq 'accidental-interface - (ly-get-grob-property elt 'interfaces)))) - (eq? (ly-get-grob-property - (ly-get-parent elt 1) 'staff-position) pos)))) + (ly:get-grob-property elt 'interfaces)))) + (eq? (ly:get-grob-property + (ly:get-parent elt 1) 'staff-position) pos)))) \score { \context Voice \notes \relative c'' { diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly index f1c764365f..54af00b374 100644 --- a/input/test/move-specific-text.ly +++ b/input/test/move-specific-text.ly @@ -1,7 +1,7 @@ -\version "1.5.68" +\version "1.7.3" #(define (make-text-checker text) - (lambda (grob) (equal? text (ly-get-grob-property grob 'text)))) + (lambda (grob) (equal? text (ly:get-grob-property grob 'text)))) \score { \notes\relative c''' { diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 0568b9130a..115c3ff927 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -22,19 +22,19 @@ using Scheme functions to save typing work. } \include "deutsch.ly" -\version "1.5.68" +\version "1.7.3" #(define (transform music) - (let* ((es (ly-get-mus-property music 'elements)) - (n (ly-music-name music)) + (let* ((es (ly:get-mus-property music 'elements)) + (n (ly:music-name music)) ) (if (not (equal? n "Sequential_music")) - (ly-warn "transform needs sequential music!") + (ly:warn "transform needs sequential music!") (begin (let recurse ((elts es)) (if (not (equal? elts '())) (begin - ((trans (ly-get-mus-property (cadr elts) 'elements)) (car elts)) + ((trans (ly:get-mus-property (cadr elts) 'elements)) (car elts)) (set-cdr! elts (cddr elts)) (recurse (cdr elts)) ) @@ -47,28 +47,28 @@ using Scheme functions to save typing work. ) #(define ((trans pitches) music) - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (p (ly-get-mus-property music 'pitch))) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (p (ly:get-mus-property music 'pitch))) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map (trans pitches) es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element ((trans pitches) e))) - (if (pitch? p) - (let* ((o (pitch-octave p)) - (n (pitch-notename p)) + (if (ly:pitch? p) + (let* ((o (ly:pitch-octave p)) + (n (ly:pitch-notename p)) (i (+ (* 7 o) n)) - (pes (ly-get-mus-property (list-ref pitches i) 'elements)) - (pnew (ly-get-mus-property (car pes) 'pitch)) + (pes (ly:get-mus-property (list-ref pitches i) 'elements)) + (pnew (ly:get-mus-property (car pes) 'pitch)) ) - (ly-set-mus-property! music 'pitch pnew) + (ly:set-mus-property! music 'pitch pnew) ) ) music @@ -79,7 +79,7 @@ using Scheme functions to save typing work. -\version "1.5.68" +\version "1.7.3" pat = \notes \transpose c'' \repeat unfold 2 { < { \context Staff=up {r8 e16 f g e f g } } diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index df76133dfe..bcacf87eb9 100644 --- a/input/test/music-creation.ly +++ b/input/test/music-creation.ly @@ -1,4 +1,4 @@ -\version "1.7.0" %% or actually: 1.7.1 ... +\version "1.7.3" %% or actually: 1.7.1 ... \header { texidoc = "You can create music expressions from Scheme. The @@ -8,24 +8,24 @@ #(define (make-note-req p d) (let* ((ml (make-music-by-name 'NoteEvent))) - (ly-set-mus-property! ml 'duration d) - (ly-set-mus-property! ml 'pitch p) + (ly:set-mus-property! ml 'duration d) + (ly:set-mus-property! ml 'pitch p) ml)) #(define (make-note elts) (let* ((ml (make-music-by-name 'EventChord))) - (ly-set-mus-property! ml 'elements elts) + (ly:set-mus-property! ml 'elements elts) ml)) #(define (seq-music-list elts) (let* ((ml (make-music-by-name 'SequentialMusic))) - (ly-set-mus-property! ml 'elements elts) + (ly:set-mus-property! ml 'elements elts) ml)) fooMusic = #(seq-music-list - (list (make-note (list (make-note-req (make-pitch 1 0 0) (make-duration 2 0)))) - (make-note (list (make-note-req (make-pitch 1 1 0) (make-duration 2 0))))) + (list (make-note (list (make-note-req (ly:make-pitch 1 0 0) (ly:make-duration 2 0)))) + (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0))))) ) \score { \fooMusic } diff --git a/input/test/ottava.ly b/input/test/ottava.ly index 3bfe76b22b..6239d5b0b3 100644 --- a/input/test/ottava.ly +++ b/input/test/ottava.ly @@ -1,4 +1,4 @@ -\version "1.7.2" +\version "1.7.3" fragment = \notes { @@ -7,7 +7,7 @@ fragment = \notes { \property Voice.TextSpanner \set #'edge-height = #'(0 . 1.5) \property Voice.TextSpanner \set #'edge-text = #'("8va " . "") \property Staff.centralCPosition = #-13 - a#(ly-export (make-span-event 'TextSpanEvent START)) b c a #(ly-export (make-span-event 'TextSpanEvent STOP)) + a#(ly:export (make-span-event 'TextSpanEvent START)) b c a #(ly:export (make-span-event 'TextSpanEvent STOP)) } \paper { linewidth = -1. } diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index 4ae00c0c0c..401b2df565 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \score{ \context PianoStaff < @@ -68,7 +68,7 @@ soloIIText = #"" aDueText = #"" splitInterval = #'(1 . 0) - changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + changeMoment = #`(,(ly:make-moment 1 1) . ,(ly:make-moment 1 1)) } \translator { diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly index 62b47d94d9..13466497b4 100644 --- a/input/test/part-combine-score.ly +++ b/input/test/part-combine-score.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc="Template for part-combining orchestral scores" @@ -265,7 +265,7 @@ archiGroup = \context StaffGroup = archi_group < % the only way to tell the difference. aDueText = #"\\`a2" splitInterval = #'(1 . 0) - changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + changeMoment = #`(,(ly:make-moment 1 1) . ,(ly:make-moment 1 1)) } \translator { \StaffGroupContext diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index 9f63f11b8b..64e8f6ad61 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \score{ \context PianoStaff < @@ -78,7 +78,7 @@ soloIIText = #"" aDueText = #"" splitInterval = #'(1 . 0) - changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + changeMoment = #`(,(ly:make-moment 1 1) . ,(ly:make-moment 1 1)) } \translator { diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index 2cc8eee498..456e557847 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc=" @@ -9,20 +9,20 @@ Simple customised music apply. music = \notes \relative c'' { c4 d4( e4 f4 } #(define (reverse-music music) - (let* ((elements (ly-get-mus-property music 'elements)) + (let* ((elements (ly:get-mus-property music 'elements)) (reversed (reverse elements)) - (e (ly-get-mus-property music 'element)) - (span-dir (ly-get-mus-property music 'span-direction))) + (e (ly:get-mus-property music 'element)) + (span-dir (ly:get-mus-property music 'span-direction))) - (ly-set-mus-property! music 'elements reversed) + (ly:set-mus-property! music 'elements reversed) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (reverse-music e))) (if (dir? span-dir) - (ly-set-mus-property! music 'span-direction (- span-dir))) + (ly:set-mus-property! music 'span-direction (- span-dir))) (map reverse-music reversed) diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly index e7802cad24..91d2c28c25 100644 --- a/input/test/scheme-interactions.ly +++ b/input/test/scheme-interactions.ly @@ -1,4 +1,4 @@ -\version "1.7.2" +\version "1.7.3" \header { @@ -15,7 +15,7 @@ bra = \notes \transpose c' { e'4-. } \score { \context Voice \notes\relative c' { c4 - #(ly-import (make-sequential-music (list foo foo foo ))) + #(ly:import (make-sequential-music (list foo foo foo ))) #(begin (define baz (make-simultaneous-music (list foo bra))) (empty-music)) c4 diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index a791a631b8..3d6ab66277 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc="You can get ugly slurs, if you want. @@ -26,7 +26,7 @@ baseWalk = \notes \relative c { Slur \override #'direction = #1 Stem \override #'direction = #-1 autoBeamSettings \override #'(end * * * *) - = #(make-moment 1 2) + = #(ly:make-moment 1 2) } \translator { \PianoStaffContext diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index 7142bf31f1..f45dfb71e2 100644 --- a/input/test/smart-transpose.ly +++ b/input/test/smart-transpose.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \header { texidoc=" @@ -20,9 +20,9 @@ how useful these enharmonic modifications are. Mats B. } #(define (unhair-pitch p) - (let* ((o (pitch-octave p)) - (a (pitch-alteration p)) - (n (pitch-notename p))) + (let* ((o (ly:pitch-octave p)) + (a (ly:pitch-alteration p)) + (n (ly:pitch-notename p))) (cond ((and (> a 0) (or (eq? n 6) (eq? n 2))) @@ -37,27 +37,27 @@ how useful these enharmonic modifications are. Mats B. (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7)))) (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7)))) - (make-pitch o n a))) + (ly:make-pitch o n a))) #(define (simplify music) - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (p (ly-get-mus-property music 'pitch))) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (p (ly:get-mus-property music 'pitch))) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map (lambda (x) (simplify x)) es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (simplify e))) - (if (pitch? p) + (if (ly:pitch? p) (begin (set! p (unhair-pitch p)) - (ly-set-mus-property! music 'pitch p))) + (ly:set-mus-property! music 'pitch p))) music)) diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 22b30373d9..e67c9f5955 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,4 +1,4 @@ -\version "1.7.2" +\version "1.7.3" \header { texidoc = "ottava spanners." @@ -7,31 +7,31 @@ texidoc = "ottava spanners." \score{ \notes\relative c''{ \property Voice.TextSpanner \override #'edge-text = #'("8 " . "") - a #(ly-export (make-span-event 'TextSpanEvent START)) + a #(ly:export (make-span-event 'TextSpanEvent START)) b c - a #(ly-export (make-span-event 'TextSpanEvent STOP)) + a #(ly:export (make-span-event 'TextSpanEvent STOP)) \property Voice.TextSpanner \revert #'type \property Voice.TextSpanner \override #'type = #'dotted-line - a #(ly-export (make-span-event 'TextSpanEvent START)) + a #(ly:export (make-span-event 'TextSpanEvent START)) b c - a #(ly-export (make-span-event 'TextSpanEvent STOP)) + a #(ly:export (make-span-event 'TextSpanEvent STOP)) \property Voice.TextSpanner \revert #'type \property Voice.TextSpanner \override #'type = #'dashed-line \property Voice.TextSpanner \override #'edge-height = #'(1 . -2) - a #(ly-export (make-span-event 'TextSpanEvent START)) + a #(ly:export (make-span-event 'TextSpanEvent START)) b c - a #(ly-export (make-span-event 'TextSpanEvent STOP)) + a #(ly:export (make-span-event 'TextSpanEvent STOP)) \property Staff.centralCPosition = #-13 \property Voice.TextSpanner \override #'dash-length = #5 \property Voice.TextSpanner \override #'thickness = #10 - a #(ly-export (make-span-event 'TextSpanEvent START)) + a #(ly:export (make-span-event 'TextSpanEvent START)) b c - a #(ly-export (make-span-event 'TextSpanEvent STOP)) + a #(ly:export (make-span-event 'TextSpanEvent STOP)) \property Staff.centralCPosition = #-6 } } diff --git a/input/test/timing.ly b/input/test/timing.ly index c856cf8328..3750711037 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -1,21 +1,21 @@ -\version "1.5.68" +\version "1.7.3" \score { \context Voice \notes\relative c { - % \property Score. measurePosition = #(make-moment -1 4) + % \property Score. measurePosition = #(ly:make-moment -1 4) \partial 4 c''4 c4 c4 c2 c1 \cadenzaOn [c8 d e f] [g a b c b c b c] \cadenzaOff c4 c4 c4 c4 - \property Score. measureLength = #(make-moment 5 4) + \property Score. measureLength = #(ly:make-moment 5 4) c1 c4 c1 c4 c4 c4 - \property Score. measurePosition = #(make-moment -3 8) + \property Score. measurePosition = #(ly:make-moment -3 8) b8 b b c4 c1 diff --git a/input/test/trill.ly b/input/test/trill.ly index af64192ca6..0b23dea57c 100644 --- a/input/test/trill.ly +++ b/input/test/trill.ly @@ -1,4 +1,4 @@ -\version "1.7.2" +\version "1.7.3" \header { texidoc="show trill line type" @@ -13,13 +13,13 @@ texidoc="show trill line type" \property Voice.TextSpanner \set #'type = #'dotted-line \property Voice.TextSpanner \set #'edge-height = #'(0 . 1.5) \property Voice.TextSpanner \set #'edge-text = #'("8va " . "") - a#(ly-export (make-span-event 'TextSpanEvent START)) b c a #(ly-export (make-span-event 'TextSpanEvent STOP)) + a#(ly:export (make-span-event 'TextSpanEvent START)) b c a #(ly:export (make-span-event 'TextSpanEvent STOP)) %\property Voice.TextSpanner \set #'font-family = #'music \property Voice.TextSpanner \set #'type = #'trill \property Voice.TextSpanner \set #'edge-height = #'(0 . 0) \property Voice.TextSpanner \set #'edge-text = #'((line (music "scripts-trill") " ") . "") - a#(ly-export (make-span-event 'TextSpanEvent START)) b c a #(ly-export (make-span-event 'TextSpanEvent STOP)) + a#(ly:export (make-span-event 'TextSpanEvent START)) b c a #(ly:export (make-span-event 'TextSpanEvent STOP)) } \paper { } } diff --git a/input/test/tuplet-spanner-duration.ly b/input/test/tuplet-spanner-duration.ly index 9415ea69af..d8da6a4d79 100644 --- a/input/test/tuplet-spanner-duration.ly +++ b/input/test/tuplet-spanner-duration.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" \score @@ -6,7 +6,7 @@ \context Voice \notes \relative c'' { \time 2/4 \times 2/3 { c8 c c c c c } -\property Voice . tupletSpannerDuration = #(make-moment 1 4) +\property Voice . tupletSpannerDuration = #(ly:make-moment 1 4) \times 2/3 { c8 c c c c c } } diff --git a/input/test/voicify-chords.ly b/input/test/voicify-chords.ly index a5fedf43ff..2c47ace1d6 100644 --- a/input/test/voicify-chords.ly +++ b/input/test/voicify-chords.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" #(define (voicify-list lst number) "Make a list of Musics. @@ -21,10 +21,10 @@ #(define (voicify-chord ch) "Split the parts of a chord into different Voices using separator" - (let* ((es (ly-get-mus-property ch 'elements))) + (let* ((es (ly:get-mus-property ch 'elements))) - (ly-set-mus-property! ch 'elements + (ly:set-mus-property! ch 'elements (voicify-list (split-list es music-separator?) 0)) ch )) @@ -32,24 +32,24 @@ #(define (voicify-music m) "Recursively split chords that are separated with \\ " - (if (not (music? m)) + (if (not (ly:music? m)) (begin (display m) (error "not music!")) ) (let* - ((es (ly-get-mus-property m 'elements)) - (e (ly-get-mus-property m 'element)) + ((es (ly:get-mus-property m 'elements)) + (e (ly:get-mus-property m 'element)) ) (if - (and (equal? (ly-music-name m) "Simultaneous_music") + (and (equal? (ly:music-name m) "Simultaneous_music") (reduce (lambda (x y ) (or x y)) (map music-separator? es))) (voicify-chord m) (begin (if (pair? es) - (ly-set-mus-property! m 'elements (map voicify-music es))) - (if (music? e) - (ly-set-mus-property! m 'element (voicify-music e))) + (ly:set-mus-property! m 'elements (map voicify-music es))) + (if (ly:music? e) + (ly:set-mus-property! m 'element (voicify-music e))) m) diff --git a/lily/duration.cc b/lily/duration.cc index 436f659df4..bfee07eba4 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -87,7 +87,7 @@ Duration::string () const } -IMPLEMENT_TYPE_P (Duration, "duration?"); +IMPLEMENT_TYPE_P (Duration, "ly:duration?"); SCM Duration::mark_smob (SCM) @@ -135,7 +135,7 @@ Duration::less_p (SCM p1, SCM p2) } LY_DEFINE(make_duration, - "make-duration", 2, 2, 0, (SCM length, SCM dotcount, + "ly:make-duration", 2, 2, 0, (SCM length, SCM dotcount, SCM num, SCM den), " @var{length} is the negative logarithm (base 2) of the duration: @@ -178,9 +178,8 @@ dots. LY_DEFINE(duration_log, - "duration-log", 1, 0, 0, (SCM dur), - " -Extract the duration log from @var{dur}" + "ly:duration-log", 1, 0, 0, (SCM dur), + "Extract the duration log from @var{dur}" ) { SCM_ASSERT_TYPE(unsmob_duration(dur), dur, SCM_ARG1, __FUNCTION__, "duration"); @@ -190,9 +189,8 @@ Extract the duration log from @var{dur}" LY_DEFINE(dot_count_log, - "duration-dot-count", 1, 0, 0, (SCM dur), - " -Extract the dot count from @var{dur}" + "ly:duration-dot-count", 1, 0, 0, (SCM dur), + "Extract the dot count from @var{dur}" ) { SCM_ASSERT_TYPE(unsmob_duration(dur), dur, SCM_ARG1, __FUNCTION__, "duration"); @@ -202,7 +200,7 @@ Extract the dot count from @var{dur}" LY_DEFINE(ly_intlog2, - "intlog2", 1, 0, 0, (SCM d), + "ly:intlog2", 1, 0, 0, (SCM d), "The 2-logarithm of 1/@var{d}." ) { @@ -214,9 +212,8 @@ LY_DEFINE(ly_intlog2, } LY_DEFINE(compression_factor, - "duration-factor", 1, 0, 0, (SCM dur), - " -Extract the compression factor from @var{dur}. Return as a pair." + "ly:duration-factor", 1, 0, 0, (SCM dur), + "Extract the compression factor from @var{dur}. Return as a pair." ) { SCM_ASSERT_TYPE(unsmob_duration(dur), dur, SCM_ARG1, __FUNCTION__, "duration"); diff --git a/lily/event.cc b/lily/event.cc index 11fa0ff0c5..fad850caf4 100644 --- a/lily/event.cc +++ b/lily/event.cc @@ -92,7 +92,7 @@ LY_DEFINE(music_duration_length, "music-duration-length", 1, 0,0, } -LY_DEFINE(music_duration_compress, "music-duration-compress", 2, 0,0, +LY_DEFINE(music_duration_compress, "ly:music-duration-compress", 2, 0,0, (SCM mus, SCM factor), "Extract the duration field from @var{mus}, and compress it.") { @@ -113,7 +113,7 @@ LY_DEFINE(music_duration_compress, "music-duration-compress", 2, 0,0, This is hairy, since the scale in a key-change event may contain octaveless notes. */ -LY_DEFINE(transpose_key_alist,"transpose-key-alist", +LY_DEFINE(transpose_key_alist, "ly:transpose-key-alist", 2, 0,0, (SCM l, SCM pitch), "Make a new key alist of @var{l} transposed by pitch @var{pitch}") { diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 0694a85ef8..eb1c518a4a 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -61,7 +61,7 @@ Font_interface::get_default_font (Grob*me) LY_DEFINE(ly_font_interface_get_default_font, - "ly-get-default-font", 1 , 0, 0, + "ly:get-default-font", 1 , 0, 0, (SCM grob), "Return the default font for grob @var{gr}.") { Grob * gr = unsmob_grob (grob); @@ -70,7 +70,7 @@ LY_DEFINE(ly_font_interface_get_default_font, return Font_interface::get_default_font (gr)->self_scm (); } -LY_DEFINE(ly_font_interface_get_font,"ly-get-font", 2, 0, 0, +LY_DEFINE(ly_font_interface_get_font,"ly:get-font", 2, 0, 0, (SCM grob, SCM alist), "Return a font metric satisfying the font-qualifiers in @var{alist}. diff --git a/lily/font-metric.cc b/lily/font-metric.cc index a25bde424f..20776e444a 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -134,7 +134,7 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state *) IMPLEMENT_SMOBS (Font_metric); IMPLEMENT_DEFAULT_EQUAL_P (Font_metric); -IMPLEMENT_TYPE_P (Font_metric, "font-metric?"); +IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?"); Molecule Font_metric::find_by_name (String) const @@ -144,7 +144,7 @@ Font_metric::find_by_name (String) const } -LY_DEFINE(ly_find_glyph_by_name, "ly-find-glyph-by-name", 2 , 0, 0, +LY_DEFINE(ly_find_glyph_by_name, "ly:find-glyph-by-name", 2 , 0, 0, (SCM font, SCM name), "This function retrieves a Molecule for the glyph named @var{name} in @var{font}. The font must be available as an AFM file.") @@ -157,7 +157,7 @@ LY_DEFINE(ly_find_glyph_by_name, "ly-find-glyph-by-name", 2 , 0, 0, } -LY_DEFINE(ly_text_dimension,"ly-text-dimension", 2 , 0, 0, +LY_DEFINE(ly_text_dimension,"ly:text-dimension", 2 , 0, 0, (SCM font, SCM text), "Given the font metric in @var{font} and the string @var{text}, compute the extents of that text in that font. The return value is a pair of diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc index 62740cdd1a..73cba4aac2 100644 --- a/lily/function-documentation.cc +++ b/lily/function-documentation.cc @@ -16,7 +16,7 @@ void ly_add_function_documentation (char const * fname, } -LY_DEFINE(ly_get_all_function_documentation, "ly-get-all-function-documentation", +LY_DEFINE(ly_get_all_function_documentation, "ly:get-all-function-documentation", 0,0,0, (), "Get a hash table with all lilypond Scheme extension functions.") { diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc index 55ebe58299..a2ae4b8389 100644 --- a/lily/grob-interface.cc +++ b/lily/grob-interface.cc @@ -19,7 +19,7 @@ void add_interface (const char * symbol, } -LY_DEFINE(ly_add_interface, "ly-add-interface", 3,0,0, (SCM a, SCM b, SCM c), +LY_DEFINE(ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c), "Add an interface description.") { SCM_ASSERT_TYPE (gh_symbol_p (a), a, SCM_ARG1, __FUNCTION__, "symbol"); @@ -39,7 +39,7 @@ LY_DEFINE(ly_add_interface, "ly-add-interface", 3,0,0, (SCM a, SCM b, SCM c), } -LY_DEFINE(ly_all_grob_interfaces, "ly-all-grob-interfaces", +LY_DEFINE(ly_all_grob_interfaces, "ly:all-grob-interfaces", 0,0,0, (), "Get a hash table with all interface descriptions.") { diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index 4e50e5c50c..5830d20fc9 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -78,7 +78,7 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi) } LY_DEFINE(ly_grob_pq_less_p, - "ly-grob-pq-less?", 2 , 0 ,0, (SCM a, SCM b), + "ly:grob-pq-less?", 2 , 0 ,0, (SCM a, SCM b), "Compare 2 Grob PQ entries. Internal") { if ( Moment::compare (*unsmob_moment (gh_car (a)), diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index 2cd6bb32d5..f46fa63bdf 100644 --- a/lily/grob-scheme.cc +++ b/lily/grob-scheme.cc @@ -5,7 +5,7 @@ #include "paper-def.hh" #include "system.hh" -LY_DEFINE(ly_set_grob_property,"ly-set-grob-property!", 3, 0, 0, +LY_DEFINE(ly_set_grob_property,"ly:set-grob-property!", 3, 0, 0, (SCM grob, SCM sym, SCM val), "Set @var{sym} in grob @var{grob} to value @var{val}") { @@ -21,7 +21,7 @@ LY_DEFINE(ly_set_grob_property,"ly-set-grob-property!", 3, 0, 0, } LY_DEFINE(ly_get_grob_property, - "ly-get-grob-property", 2, 0, 0, (SCM grob, SCM sym), + "ly:get-grob-property", 2, 0, 0, (SCM grob, SCM sym), "Get the value of a value in grob @var{g} of property @var{sym}. It will return @code{'()} (end-of-list) if @var{g} doesn't have @var{sym} set. @@ -52,7 +52,7 @@ initially read from @file{scm/grob-description.scm}. return sc->internal_get_grob_property (sym); } -LY_DEFINE(spanner_get_bound, "ly-get-spanner-bound", 2 , 0, 0, +LY_DEFINE(spanner_get_bound, "ly:get-spanner-bound", 2 , 0, 0, (SCM slur, SCM dir), "Get one of the bounds of @var{spanner}. @var{dir} may be @code{-1} for left, and @code{1} for right. @@ -68,7 +68,7 @@ left, and @code{1} for right. TODO: make difference between scaled and unscalead variable in calling (i.e different funcs.) */ -LY_DEFINE(ly_get_paper_var,"ly-get-paper-variable", 2, 0, 0, +LY_DEFINE(ly_get_paper_var,"ly:get-paper-variable", 2, 0, 0, (SCM grob, SCM sym), "Get a variable from the \\paper block.") { @@ -81,7 +81,7 @@ LY_DEFINE(ly_get_paper_var,"ly-get-paper-variable", 2, 0, 0, -LY_DEFINE(ly_get_extent, "ly-get-extent", 3, 0, 0, +LY_DEFINE(ly_get_extent, "ly:get-extent", 3, 0, 0, (SCM grob, SCM refp, SCM axis), "Get the extent in @var{axis} direction of @var{grob} relative to the grob @var{refp}") @@ -96,7 +96,7 @@ grob @var{refp}") return ly_interval2scm ( sc->extent (ref, Axis (gh_scm2int (axis)))); } -LY_DEFINE (ly_get_parent, "ly-get-parent", 2, 0, 0, (SCM grob, SCM axis), +LY_DEFINE (ly_get_parent, "ly:get-parent", 2, 0, 0, (SCM grob, SCM axis), "Get the parent of @var{grob}. @var{axis} can be 0 for the X-axis, 1 for the Y-axis.") { @@ -110,7 +110,7 @@ for the Y-axis.") /* ly prefix? */ LY_DEFINE (get_system, - "get-system", + "ly:get-system", 1, 0, 0, (SCM grob), " Return the System Grob of @var{grob}. @@ -127,7 +127,7 @@ Return the System Grob of @var{grob}. /* ly prefix? */ LY_DEFINE (get_original, - "get-original", + "ly:get-original", 1, 0, 0, (SCM grob), " Return the original Grob of @var{grob} @@ -146,7 +146,7 @@ Return the original Grob of @var{grob} */ LY_DEFINE (get_broken_into, - "get-broken-into", 1, 0, 0, (SCM spanner), + "ly:get-broken-into", 1, 0, 0, (SCM spanner), " Return broken-into list for @var{spanner}. " diff --git a/lily/grob.cc b/lily/grob.cc index 4124e7ffc3..8c059f6274 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -825,7 +825,7 @@ ly_grobs2scm (Link_array a) } -IMPLEMENT_TYPE_P (Grob, "ly-grob?"); +IMPLEMENT_TYPE_P (Grob, "ly:grob?"); ADD_INTERFACE (Grob, "grob-interface", "In music notation, lots of symbols are related in some way. You can diff --git a/lily/identifier-smob.cc b/lily/identifier-smob.cc index f3881b48ed..a17efc4ae6 100644 --- a/lily/identifier-smob.cc +++ b/lily/identifier-smob.cc @@ -31,7 +31,7 @@ print_box (SCM b, SCM port, scm_print_state *pstate) /* This defines the primitve `make-box', which returns a new smob of type `box', initialized to `#f'. */ -LY_DEFINE(package_identifier, "ly-export", 1,0,0, (SCM arg), +LY_DEFINE(package_identifier, "ly:export", 1,0,0, (SCM arg), "Export a Scheme object to the parser, so it is treated as an identifier.") { /* This macro creates the new objects, stores the value `#f' into it diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc index 64113912ae..9ed2878c08 100644 --- a/lily/input-file-results.cc +++ b/lily/input-file-results.cc @@ -33,7 +33,7 @@ #include "ly-modules.hh" -LY_DEFINE(ly_set_point_and_click_x, "set-point-and-click!", 1, 0, 0, +LY_DEFINE(ly_set_point_and_click_x, "ly:set-point-and-click!", 1, 0, 0, (SCM what), "Set the options for Point-and-click source specials output. The argument is a symbol. Possible options are @code{none} (no source specials), diff --git a/lily/input-smob.cc b/lily/input-smob.cc index deb8748e3a..2b5d8cbfdd 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -39,14 +39,14 @@ free_smob (SCM s) We don't use IMPLEMENT_TYPE_P, since the smobification part is implemented separately from the class. */ -LY_DEFINE(ly_input, "ly-input-location?", 1, 0, 0, +LY_DEFINE(ly_input, "ly:input-location?", 1, 0, 0, (SCM x), "Return whether @var{x} is an input location") { return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ; } -LY_DEFINE(ly_input_message, "ly-input-message", 2, 0, 0, (SCM sip, SCM msg), +LY_DEFINE(ly_input_message, "ly:input-message", 2, 0, 0, (SCM sip, SCM msg), "Print @var{msg} as a GNU compliant error message, pointing to the\n" "location in @var{sip}.\n" ) diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index ef50c52027..096cf36d51 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -102,7 +102,7 @@ gulp_file_to_string (String fn) return result; } -LY_DEFINE(ly_gulp_file, "ly-gulp-file", 1,0, 0, +LY_DEFINE(ly_gulp_file, "ly:gulp-file", 1,0, 0, (SCM name), "Read the file named @var{name}, and return its contents in a string. The file is looked up using the lilypond search path. @@ -151,7 +151,7 @@ index_set_cell (SCM s, Direction d, SCM v) return s; } -LY_DEFINE(ly_warning,"ly-warn", 1, 0, 0, +LY_DEFINE(ly_warning,"ly:warn", 1, 0, 0, (SCM str),"Scheme callable function to issue the warning @code{msg}.") { SCM_ASSERT_TYPE (gh_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); @@ -159,7 +159,7 @@ LY_DEFINE(ly_warning,"ly-warn", 1, 0, 0, return SCM_BOOL_T; } -LY_DEFINE(ly_isdir, "dir?", 1,0, 0, (SCM s), +LY_DEFINE(ly_isdir, "ly:dir?", 1,0, 0, (SCM s), "type predicate. A direction is a -1, 0 or 1, where -1 represents left or down and 1 represents right or up. ") @@ -198,6 +198,7 @@ ly_init_ly_module (void *data) if (verbose_global_b) progress_indication ("\n"); + scm_primitive_load_path (scm_makfrom0str ("lily.scm")); } @@ -308,7 +309,7 @@ ly_scm2offset (SCM s) } -LY_DEFINE(ly_number2string, "ly-number->string", 1, 0,0, +LY_DEFINE(ly_number2string, "ly:number->string", 1, 0,0, (SCM s), " converts @var{num} to a string without generating many decimals. It leaves a space at the end. @@ -362,7 +363,7 @@ wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3) #include "version.hh" -LY_DEFINE(ly_version, "ly-version", 0, 0, 0, (), +LY_DEFINE(ly_version, "ly:version", 0, 0, 0, (), "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ") @@ -372,13 +373,13 @@ LY_DEFINE(ly_version, "ly-version", 0, 0, 0, (), return gh_eval_str ((char*)vs); } -LY_DEFINE(ly_unit, "ly-unit", 0, 0, 0, (), +LY_DEFINE(ly_unit, "ly:unit", 0, 0, 0, (), "Return the unit used for lengths as a string.") { return scm_makfrom0str (INTERNAL_UNIT); } -LY_DEFINE(ly_verbose, "ly-verbose", 0, 0, 0, (), +LY_DEFINE(ly_verbose, "ly:verbose", 0, 0, 0, (), "Return whether lilypond is being run in verbose mode.") { return gh_bool2scm (verbose_global_b); diff --git a/lily/lookup.cc b/lily/lookup.cc index 75003693ba..e12dd064ff 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -554,7 +554,7 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude) /* TODO: use rounded boxes. */ -LY_DEFINE(ly_bracket ,"ly-bracket", +LY_DEFINE(ly_bracket ,"ly:bracket", 4, 0, 0, (SCM a, SCM iv, SCM t, SCM p), "Make a bracket in direction @var{a}. The extent of the bracket is diff --git a/lily/molecule.cc b/lily/molecule.cc index 15cc8f2f07..127850d123 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -135,7 +135,7 @@ Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding) add_molecule (toadd); } -LY_DEFINE(ly_set_molecule_extent_x,"ly-set-molecule-extent!", 3 , 0, 0, +LY_DEFINE(ly_set_molecule_extent_x,"ly:set-molecule-extent!", 3 , 0, 0, (SCM mol, SCM axis, SCM np), "Set the extent (@var{extent} must be a pair of numbers) of @var{mol} in @var{axis} direction (0 or 1 for x- and y-axis respectively). @@ -156,7 +156,7 @@ smaller than @code{B}, and is often negative. } LY_DEFINE(ly_get_molecule_extent, - "ly-get-molecule-extent", 2 , 0, 0, (SCM mol, SCM axis), + "ly:get-molecule-extent", 2 , 0, 0, (SCM mol, SCM axis), "Return a pair of numbers signifying the extent of @var{mol} in @var{axis} direction (0 or 1 for x and y axis respectively). ") @@ -170,7 +170,7 @@ LY_DEFINE(ly_get_molecule_extent, LY_DEFINE(ly_molecule_combined_at_edge, - "ly-combine-molecule-at-edge", + "ly:combine-molecule-at-edge", 5 , 0, 0, (SCM first, SCM axis, SCM direction, SCM second, SCM padding), "Construct a molecule by putting @var{second} next to @@ -201,7 +201,7 @@ space to add in between measured in global staff space.") FIXME: support variable number of arguments " */ LY_DEFINE(ly_add_molecule , - "ly-add-molecule", 2, 0,0,(SCM first, SCM second), + "ly:add-molecule", 2, 0,0,(SCM first, SCM second), "Combine two molecules." ) { @@ -219,7 +219,7 @@ LY_DEFINE(ly_add_molecule , } LY_DEFINE(ly_make_molecule, - "ly-make-molecule", 3, 0, 0, (SCM expr, SCM xext, SCM yext), + "ly:make-molecule", 3, 0, 0, (SCM expr, SCM xext, SCM yext), " The objective of any typesetting system is to put ink on paper in the right places. For LilyPond, this final stage is left to the @TeX{} and @@ -271,7 +271,7 @@ fontify_atom (Font_metric const * met, SCM f) ly_quote_scm (met->description_), f, SCM_UNDEFINED); } -LY_DEFINE(ly_fontify_atom,"ly-fontify-atom", 2, 0, 0, +LY_DEFINE(ly_fontify_atom,"ly:fontify-atom", 2, 0, 0, (SCM met, SCM f), "Add a font selection command for the font metric @var{met} to @var{f}.") { @@ -279,7 +279,7 @@ LY_DEFINE(ly_fontify_atom,"ly-fontify-atom", 2, 0, 0, return fontify_atom (unsmob_metrics (met), f); } -LY_DEFINE(ly_align_to_x,"ly-align-to!", 3, 0, 0, (SCM mol, SCM axis, SCM dir), +LY_DEFINE(ly_align_to_x,"ly:align-to!", 3, 0, 0, (SCM mol, SCM axis, SCM dir), "Align @var{mol} using its own extents.") { SCM_ASSERT_TYPE(unsmob_molecule (mol), mol, SCM_ARG1, __FUNCTION__, "molecule"); @@ -342,6 +342,6 @@ Molecule::mark_smob (SCM s) return r->expr_; } -IMPLEMENT_TYPE_P (Molecule, "molecule?"); +IMPLEMENT_TYPE_P (Molecule, "ly:molecule?"); IMPLEMENT_DEFAULT_EQUAL_P (Molecule); diff --git a/lily/moment.cc b/lily/moment.cc index b3d2fbcaa8..3889df8ea0 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -14,7 +14,7 @@ #include "ly-smobs.icc" IMPLEMENT_SIMPLE_SMOBS (Moment); -IMPLEMENT_TYPE_P (Moment, "moment?"); +IMPLEMENT_TYPE_P (Moment, "ly:moment?"); SCM Moment::mark_smob (SCM) @@ -47,7 +47,7 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *) /* TODO: add optional factor argument. */ -LY_DEFINE (make_moment,"make-moment", 2,0,0, (SCM n, SCM d), +LY_DEFINE (make_moment,"ly:make-moment", 2,0,0, (SCM n, SCM d), "create the rational number with main timing @var{n}/@var{d}. diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index c880e9bf96..f0af464243 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -179,7 +179,7 @@ Music_iterator::get_music () const /****************************************************************/ -IMPLEMENT_TYPE_P (Music_iterator, "ly-iterator?"); +IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?"); IMPLEMENT_SMOBS(Music_iterator); IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator); diff --git a/lily/music.cc b/lily/music.cc index b9944608c1..f7b734c238 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -168,7 +168,7 @@ Music::to_relative_octave (Pitch m) } -IMPLEMENT_TYPE_P (Music, "music?"); +IMPLEMENT_TYPE_P (Music, "ly:music?"); IMPLEMENT_SMOBS (Music); IMPLEMENT_DEFAULT_EQUAL_P (Music); @@ -220,7 +220,7 @@ Music::~Music () } LY_DEFINE(ly_get_mus_property, - "ly-get-mus-property", 2, 0, 0, (SCM mus, SCM sym), + "ly:get-mus-property", 2, 0, 0, (SCM mus, SCM sym), "Get the property @var{sym} of music expression @var{mus}.") { Music * sc = unsmob_music (mus); @@ -231,7 +231,7 @@ LY_DEFINE(ly_get_mus_property, } LY_DEFINE(ly_set_mus_property, - "ly-set-mus-property!", 3, 0, 0, + "ly:set-mus-property!", 3, 0, 0, (SCM mus, SCM sym, SCM val), "Set property @var{sym} in music expression @var{mus} to @var{val}.") { @@ -249,7 +249,7 @@ LY_DEFINE(ly_set_mus_property, } -LY_DEFINE(ly_music_name, "ly-music-name", 1, 0, 0, +LY_DEFINE(ly_music_name, "ly:music-name", 1, 0, 0, (SCM mus), "Return the name of @var{music}.") { @@ -264,7 +264,7 @@ LY_DEFINE(ly_music_name, "ly-music-name", 1, 0, 0, // to do property args LY_DEFINE(ly_extended_make_music, - "ly-make-bare-music", 2, 0, 0, (SCM type, SCM props), + "ly:make-bare-music", 2, 0, 0, (SCM type, SCM props), "Make a music object/expression of type @var{type}, init with\n" "@var{props}. Warning: this interface will likely change in the near\n" "future.\n" @@ -285,7 +285,7 @@ LY_DEFINE(ly_extended_make_music, // to do property args LY_DEFINE(ly_get_mutable_properties, - "ly-get-mutable-properties", 1, 0, 0, (SCM mus), + "ly:get-mutable-properties", 1, 0, 0, (SCM mus), "Return an alist signifying the mutable properties of @var{mus}.\n" "The immutable properties are not available; they should be initialized\n" "by the functions make-music-by-name function.\n" diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index 3364e25658..5780e7360e 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -115,7 +115,7 @@ protected_ly_parse_scm (Parse_start *ps) static bool protect = true; -LY_DEFINE(set_parse_protect, "ly-set-parse-protect", +LY_DEFINE(set_parse_protect, "ly:set-parse-protect", 1,0,0, (SCM t), "If protection is switched on, errors in inline scheme are caught. If off, GUILE will halt on errors, and give a stack trace. Default is protected evaluation.") diff --git a/lily/parser.yy b/lily/parser.yy index 4c1e42c80d..8d9fed63e3 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1825,8 +1825,8 @@ simple_element: ev = MY_MAKE_MUSIC("RestEvent"); } - skip->set_mus_property ("duration" ,$2); - skip->set_spot (i); + ev->set_mus_property ("duration" ,$2); + ev->set_spot (i); Music * velt = MY_MAKE_MUSIC("EventChord"); velt->set_mus_property ("elements", scm_list_n (ev->self_scm (),SCM_UNDEFINED)); velt->set_spot (i); diff --git a/lily/pitch.cc b/lily/pitch.cc index 09ebadf660..4c1a9cc4d0 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -221,7 +221,7 @@ Pitch::down_to (int notename) } LY_DEFINE(ly_pitch_transpose, - "ly-transpose-pitch", 2, 0, 0, + "ly:transpose-pitch", 2, 0, 0, (SCM p, SCM delta), "Transpose @var{p} by the amount @var{delta}, where @var{delta} is the pitch that central C is transposed to. @@ -240,7 +240,7 @@ pitch that central C is transposed to. /****************************************************************/ -IMPLEMENT_TYPE_P (Pitch, "pitch?"); +IMPLEMENT_TYPE_P (Pitch, "ly:pitch?"); SCM Pitch::mark_smob (SCM) @@ -291,7 +291,7 @@ Pitch::less_p (SCM p1, SCM p2) should add optional args */ -LY_DEFINE(make_pitch, "make-pitch", 3, 0, 0, +LY_DEFINE(make_pitch, "ly:make-pitch", 3, 0, 0, (SCM o, SCM n, SCM a), " @var{octave} is specified by an integer, zero for the octave containing @@ -310,7 +310,7 @@ flats, or positive for sharps. } -LY_DEFINE(pitch_octave, "pitch-octave", 1, 0, 0, +LY_DEFINE(pitch_octave, "ly:pitch-octave", 1, 0, 0, (SCM pp), "extract the octave from pitch @var{p}.") { @@ -321,7 +321,7 @@ LY_DEFINE(pitch_octave, "pitch-octave", 1, 0, 0, return gh_int2scm (q); } -LY_DEFINE(pitch_alteration, "pitch-alteration", 1, 0, 0, +LY_DEFINE(pitch_alteration, "ly:pitch-alteration", 1, 0, 0, (SCM pp), "extract the alteration from pitch @var{p}.") { @@ -332,7 +332,7 @@ LY_DEFINE(pitch_alteration, "pitch-alteration", 1, 0, 0, return gh_int2scm (q); } -LY_DEFINE(pitch_notename, "pitch-notename", 1, 0, 0, +LY_DEFINE(pitch_notename, "ly:pitch-notename", 1, 0, 0, (SCM pp), "extract the note name from pitch @var{pp}.") { @@ -343,7 +343,7 @@ LY_DEFINE(pitch_notename, "pitch-notename", 1, 0, 0, return gh_int2scm (q); } -LY_DEFINE(pitch_semitones, "pitch-semitones", 1, 0, 0, +LY_DEFINE(pitch_semitones, "ly:pitch-semitones", 1, 0, 0, (SCM pp), "calculate the number of semitones of @var{p} from central C.") { @@ -362,7 +362,7 @@ LY_DEFINE(pitch_semitones, "pitch-semitones", 1, 0, 0, return gh_int2scm (q); } -LY_DEFINE(pitch_less, "pitch *global_translator_dict=0; -LY_DEFINE(ly_get_all_translators,"ly-get-all-translators", 0, 0, 0, (), +LY_DEFINE(get_all_translators,"ly:get-all-translators", 0, 0, 0, (), "Return an list of a all translator objects that may be instantiated during a lilypond run.") { diff --git a/lily/translator-scheme.cc b/lily/translator-scheme.cc index b501c555a4..f43e6fea3f 100644 --- a/lily/translator-scheme.cc +++ b/lily/translator-scheme.cc @@ -4,7 +4,7 @@ #include "lily-guile.hh" LY_DEFINE(ly_get_context_property, - "ly-get-context-property", 2, 0, 0, + "ly:get-context-property", 2, 0, 0, (SCM context, SCM name), "retrieve the value of @var{name} from context @var{context}") { @@ -18,7 +18,7 @@ LY_DEFINE(ly_get_context_property, } LY_DEFINE(ly_set_context_property, - "ly-set-context-property", 3, 0, 0, + "ly:set-context-property", 3, 0, 0, (SCM context, SCM name, SCM val), "set value of property @var{name} in context @var{context} to @var{val}. ") diff --git a/lily/translator.cc b/lily/translator.cc index dd4ea8c236..3438187c8c 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -135,7 +135,7 @@ Translator::mark_smob (SCM sm) } LY_DEFINE(ly_translator_name, - "ly-translator-name", 1,0,0, (SCM trans), + "ly:translator-name", 1,0,0, (SCM trans), "Return the type name of the translator @var{trans}. ") { @@ -147,7 +147,7 @@ LY_DEFINE(ly_translator_name, } LY_DEFINE(ly_translator_description, - "ly-translator-description", + "ly:translator-description", 1,0,0, (SCM me), "Return an alist of properties of translator @var{me}.") { diff --git a/ly/catalan.ly b/ly/catalan.ly index 92e0ca8140..633686f14e 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -18,59 +18,59 @@ % For using "sostingut" notation, which is also correct \pitchnames #`( - (dobb . ,(make-pitch -1 0 -2 )) - (dob . ,(make-pitch -1 0 -1 )) - (do . ,(make-pitch -1 0 0 )) - (dod . ,(make-pitch -1 0 1 )) - (dodd . ,(make-pitch -1 0 2 )) - (rebb . ,(make-pitch -1 1 -2 )) - (reb . ,(make-pitch -1 1 -1 )) - (re . ,(make-pitch -1 1 0 )) - (red . ,(make-pitch -1 1 1 )) - (redd . ,(make-pitch -1 1 2 )) - (mibb . ,(make-pitch -1 2 -2 )) - (mib . ,(make-pitch -1 2 -1 )) - (mi . ,(make-pitch -1 2 0 )) - (mid . ,(make-pitch -1 2 1 )) - (midd . ,(make-pitch -1 2 2 )) - (fabb . ,(make-pitch -1 3 -2 )) - (fab . ,(make-pitch -1 3 -1 )) - (fa . ,(make-pitch -1 3 0 )) - (fad . ,(make-pitch -1 3 1 )) - (fadd . ,(make-pitch -1 3 2 )) - (solbb . ,(make-pitch -1 4 -2 )) - (solb . ,(make-pitch -1 4 -1 )) - (sol . ,(make-pitch -1 4 0 )) - (sold . ,(make-pitch -1 4 1 )) - (soldd . ,(make-pitch -1 4 2 )) - (labb . ,(make-pitch -1 5 -2 )) - (lab . ,(make-pitch -1 5 -1 )) - (la . ,(make-pitch -1 5 0 )) - (lad . ,(make-pitch -1 5 1 )) - (ladd . ,(make-pitch -1 5 2 )) - (sibb . ,(make-pitch -1 6 -2 )) - (sib . ,(make-pitch -1 6 -1 )) - (si . ,(make-pitch -1 6 0 )) - (sid . ,(make-pitch -1 6 1 )) - (sidd . ,(make-pitch -1 6 2 )) + (dobb . ,(ly:make-pitch -1 0 -2 )) + (dob . ,(ly:make-pitch -1 0 -1 )) + (do . ,(ly:make-pitch -1 0 0 )) + (dod . ,(ly:make-pitch -1 0 1 )) + (dodd . ,(ly:make-pitch -1 0 2 )) + (rebb . ,(ly:make-pitch -1 1 -2 )) + (reb . ,(ly:make-pitch -1 1 -1 )) + (re . ,(ly:make-pitch -1 1 0 )) + (red . ,(ly:make-pitch -1 1 1 )) + (redd . ,(ly:make-pitch -1 1 2 )) + (mibb . ,(ly:make-pitch -1 2 -2 )) + (mib . ,(ly:make-pitch -1 2 -1 )) + (mi . ,(ly:make-pitch -1 2 0 )) + (mid . ,(ly:make-pitch -1 2 1 )) + (midd . ,(ly:make-pitch -1 2 2 )) + (fabb . ,(ly:make-pitch -1 3 -2 )) + (fab . ,(ly:make-pitch -1 3 -1 )) + (fa . ,(ly:make-pitch -1 3 0 )) + (fad . ,(ly:make-pitch -1 3 1 )) + (fadd . ,(ly:make-pitch -1 3 2 )) + (solbb . ,(ly:make-pitch -1 4 -2 )) + (solb . ,(ly:make-pitch -1 4 -1 )) + (sol . ,(ly:make-pitch -1 4 0 )) + (sold . ,(ly:make-pitch -1 4 1 )) + (soldd . ,(ly:make-pitch -1 4 2 )) + (labb . ,(ly:make-pitch -1 5 -2 )) + (lab . ,(ly:make-pitch -1 5 -1 )) + (la . ,(ly:make-pitch -1 5 0 )) + (lad . ,(ly:make-pitch -1 5 1 )) + (ladd . ,(ly:make-pitch -1 5 2 )) + (sibb . ,(ly:make-pitch -1 6 -2 )) + (sib . ,(ly:make-pitch -1 6 -1 )) + (si . ,(ly:make-pitch -1 6 0 )) + (sid . ,(ly:make-pitch -1 6 1 )) + (sidd . ,(ly:make-pitch -1 6 2 )) ;; Now that we have espanol.ly, should these be junked? --jcn - (dos . ,(make-pitch -1 0 1 )) - (doss . ,(make-pitch -1 0 2 )) - (res . ,(make-pitch -1 1 1 )) - (ress . ,(make-pitch -1 1 2 )) - (mis . ,(make-pitch -1 2 1 )) - (miss . ,(make-pitch -1 2 2 )) - (fas . ,(make-pitch -1 3 1 )) - (fass . ,(make-pitch -1 3 2 )) - (sols . ,(make-pitch -1 4 1 )) - (solss . ,(make-pitch -1 4 2 )) - (las . ,(make-pitch -1 5 1 )) - (lass . ,(make-pitch -1 5 2 )) - (sis . ,(make-pitch -1 6 1 )) - (siss . ,(make-pitch -1 6 2 )) + (dos . ,(ly:make-pitch -1 0 1 )) + (doss . ,(ly:make-pitch -1 0 2 )) + (res . ,(ly:make-pitch -1 1 1 )) + (ress . ,(ly:make-pitch -1 1 2 )) + (mis . ,(ly:make-pitch -1 2 1 )) + (miss . ,(ly:make-pitch -1 2 2 )) + (fas . ,(ly:make-pitch -1 3 1 )) + (fass . ,(ly:make-pitch -1 3 2 )) + (sols . ,(ly:make-pitch -1 4 1 )) + (solss . ,(ly:make-pitch -1 4 2 )) + (las . ,(ly:make-pitch -1 5 1 )) + (lass . ,(ly:make-pitch -1 5 2 )) + (sis . ,(ly:make-pitch -1 6 1 )) + (siss . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index 2328779f4b..8ca7394237 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,17 +1,17 @@ -\version "1.5.68" +\version "1.7.3" % urg! % \chordmodifiers #`( - (m . ,(make-pitch 0 2 -1 )) - (min . ,(make-pitch 0 2 -1 )) - (aug . ,(make-pitch 0 4 1 )) - ;; (dim . ,(make-pitch -100 4 -1 )) - (dim . ,(make-pitch -100 2 -1 )) + (m . ,(ly:make-pitch 0 2 -1 )) + (min . ,(ly:make-pitch 0 2 -1 )) + (aug . ,(ly:make-pitch 0 4 1 )) + ;; (dim . ,(ly:make-pitch -100 4 -1 )) + (dim . ,(ly:make-pitch -100 2 -1 )) ;; urg, not actually a chord-modifier, but it works ;; c7 -> , c 7+ -> c b - (maj . ,(make-pitch 0 6 1 )) + (maj . ,(ly:make-pitch 0 6 1 )) ;; sus4 should delete 2 too... - (sus . ,(make-pitch 0 3 0 )) + (sus . ,(ly:make-pitch 0 3 0 )) ) diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 40c01f5d0b..1ae8561c1e 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,8 +1,8 @@ -\version "1.5.68" -breve = \duration #(make-duration -1 0) -longa = \duration #(make-duration -2 0 ) -maxima = \duration #(make-duration -3 0) +\version "1.7.3" +breve = \duration #(ly:make-duration -1 0) +longa = \duration #(ly:make-duration -2 0 ) +maxima = \duration #(ly:make-duration -3 0) \include "nederlands.ly" % dutch \include "chord-modifiers-init.ly" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 0ce1917dcb..fb5a8070a8 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -8,45 +8,45 @@ \pitchnames #`( - (ceses . ,(make-pitch -1 0 -2 )) - (ces . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cis . ,(make-pitch -1 0 1 )) - (cisis . ,(make-pitch -1 0 2 )) - (deses . ,(make-pitch -1 1 -2 )) - (des . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dis . ,(make-pitch -1 1 1 )) - (disis . ,(make-pitch -1 1 2 )) - (eses . ,(make-pitch -1 2 -2 )) - (es . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eis . ,(make-pitch -1 2 1 )) - (eisis . ,(make-pitch -1 2 2 )) - (feses . ,(make-pitch -1 3 -2 )) - (fes . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fis . ,(make-pitch -1 3 1 )) - (fisis . ,(make-pitch -1 3 2 )) - (geses . ,(make-pitch -1 4 -2 )) - (ges . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gis . ,(make-pitch -1 4 1 )) - (gisis . ,(make-pitch -1 4 2 )) - (asas . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) ;;non-standard name for asas - (as . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (ais . ,(make-pitch -1 5 1 )) - (aisis . ,(make-pitch -1 5 2 )) - (heses . ,(make-pitch -1 6 -2 )) - (b . ,(make-pitch -1 6 -1 )) - (h . ,(make-pitch -1 6 0 )) - (his . ,(make-pitch -1 6 1 )) - (hisis . ,(make-pitch -1 6 2 )) + (ceses . ,(ly:make-pitch -1 0 -2 )) + (ces . ,(ly:make-pitch -1 0 -1 )) + (c . ,(ly:make-pitch -1 0 0 )) + (cis . ,(ly:make-pitch -1 0 1 )) + (cisis . ,(ly:make-pitch -1 0 2 )) + (deses . ,(ly:make-pitch -1 1 -2 )) + (des . ,(ly:make-pitch -1 1 -1 )) + (d . ,(ly:make-pitch -1 1 0 )) + (dis . ,(ly:make-pitch -1 1 1 )) + (disis . ,(ly:make-pitch -1 1 2 )) + (eses . ,(ly:make-pitch -1 2 -2 )) + (es . ,(ly:make-pitch -1 2 -1 )) + (e . ,(ly:make-pitch -1 2 0 )) + (eis . ,(ly:make-pitch -1 2 1 )) + (eisis . ,(ly:make-pitch -1 2 2 )) + (feses . ,(ly:make-pitch -1 3 -2 )) + (fes . ,(ly:make-pitch -1 3 -1 )) + (f . ,(ly:make-pitch -1 3 0 )) + (fis . ,(ly:make-pitch -1 3 1 )) + (fisis . ,(ly:make-pitch -1 3 2 )) + (geses . ,(ly:make-pitch -1 4 -2 )) + (ges . ,(ly:make-pitch -1 4 -1 )) + (g . ,(ly:make-pitch -1 4 0 )) + (gis . ,(ly:make-pitch -1 4 1 )) + (gisis . ,(ly:make-pitch -1 4 2 )) + (asas . ,(ly:make-pitch -1 5 -2 )) + (ases . ,(ly:make-pitch -1 5 -2 )) ;;non-standard name for asas + (as . ,(ly:make-pitch -1 5 -1 )) + (a . ,(ly:make-pitch -1 5 0 )) + (ais . ,(ly:make-pitch -1 5 1 )) + (aisis . ,(ly:make-pitch -1 5 2 )) + (heses . ,(ly:make-pitch -1 6 -2 )) + (b . ,(ly:make-pitch -1 6 -1 )) + (h . ,(ly:make-pitch -1 6 0 )) + (his . ,(ly:make-pitch -1 6 1 )) + (hisis . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index 7e1b3e35dc..b5c7bd2370 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" % % declare the standard dynamic identifiers. @@ -6,7 +6,7 @@ #(define (make-dynamic-script str) (let* ((m (make-music-by-name 'AbsoluteDynamicEvent))) - (ly-set-mus-property! m 'text str) + (ly:set-mus-property! m 'text str) m )) ppppp = #(make-dynamic-script "pppp") diff --git a/ly/english.ly b/ly/english.ly index c3f415b276..d921272d0a 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -4,79 +4,79 @@ %} \pitchnames #`( - (cflatflat . ,(make-pitch -1 0 -2 )) - (cflat . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (csharp . ,(make-pitch -1 0 1 )) - (csharpsharp . ,(make-pitch -1 0 2 )) - (dflatflat . ,(make-pitch -1 1 -2 )) - (dflat . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dsharp . ,(make-pitch -1 1 1 )) - (dsharpsharp . ,(make-pitch -1 1 2 )) - (eflatflat . ,(make-pitch -1 2 -2 )) - (eflat . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (esharp . ,(make-pitch -1 2 1 )) - (esharpsharp . ,(make-pitch -1 2 2 )) - (fflatflat . ,(make-pitch -1 3 -2 )) - (fflat . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fsharp . ,(make-pitch -1 3 1 )) - (fsharpsharp . ,(make-pitch -1 3 2 )) - (gflatflat . ,(make-pitch -1 4 -2 )) - (gflat . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gsharp . ,(make-pitch -1 4 1 )) - (gsharpsharp . ,(make-pitch -1 4 2 )) - (aflatflat . ,(make-pitch -1 5 -2 )) - (aflat . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (asharp . ,(make-pitch -1 5 1 )) - (asharpsharp . ,(make-pitch -1 5 2 )) - (bflatflat . ,(make-pitch -1 6 -2 )) - (bflat . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 0 )) - (bsharp . ,(make-pitch -1 6 1 )) - (bsharpsharp . ,(make-pitch -1 6 2 )) + (cflatflat . ,(ly:make-pitch -1 0 -2 )) + (cflat . ,(ly:make-pitch -1 0 -1 )) + (c . ,(ly:make-pitch -1 0 0 )) + (csharp . ,(ly:make-pitch -1 0 1 )) + (csharpsharp . ,(ly:make-pitch -1 0 2 )) + (dflatflat . ,(ly:make-pitch -1 1 -2 )) + (dflat . ,(ly:make-pitch -1 1 -1 )) + (d . ,(ly:make-pitch -1 1 0 )) + (dsharp . ,(ly:make-pitch -1 1 1 )) + (dsharpsharp . ,(ly:make-pitch -1 1 2 )) + (eflatflat . ,(ly:make-pitch -1 2 -2 )) + (eflat . ,(ly:make-pitch -1 2 -1 )) + (e . ,(ly:make-pitch -1 2 0 )) + (esharp . ,(ly:make-pitch -1 2 1 )) + (esharpsharp . ,(ly:make-pitch -1 2 2 )) + (fflatflat . ,(ly:make-pitch -1 3 -2 )) + (fflat . ,(ly:make-pitch -1 3 -1 )) + (f . ,(ly:make-pitch -1 3 0 )) + (fsharp . ,(ly:make-pitch -1 3 1 )) + (fsharpsharp . ,(ly:make-pitch -1 3 2 )) + (gflatflat . ,(ly:make-pitch -1 4 -2 )) + (gflat . ,(ly:make-pitch -1 4 -1 )) + (g . ,(ly:make-pitch -1 4 0 )) + (gsharp . ,(ly:make-pitch -1 4 1 )) + (gsharpsharp . ,(ly:make-pitch -1 4 2 )) + (aflatflat . ,(ly:make-pitch -1 5 -2 )) + (aflat . ,(ly:make-pitch -1 5 -1 )) + (a . ,(ly:make-pitch -1 5 0 )) + (asharp . ,(ly:make-pitch -1 5 1 )) + (asharpsharp . ,(ly:make-pitch -1 5 2 )) + (bflatflat . ,(ly:make-pitch -1 6 -2 )) + (bflat . ,(ly:make-pitch -1 6 -1 )) + (b . ,(ly:make-pitch -1 6 0 )) + (bsharp . ,(ly:make-pitch -1 6 1 )) + (bsharpsharp . ,(ly:make-pitch -1 6 2 )) - (cff . ,(make-pitch -1 0 -2 )) - (cf . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cs . ,(make-pitch -1 0 1 )) - (css . ,(make-pitch -1 0 2 )) - (dff . ,(make-pitch -1 1 -2 )) - (df . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (ds . ,(make-pitch -1 1 1 )) - (dss . ,(make-pitch -1 1 2 )) - (eff . ,(make-pitch -1 2 -2 )) - (ef . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) + (cff . ,(ly:make-pitch -1 0 -2 )) + (cf . ,(ly:make-pitch -1 0 -1 )) + (c . ,(ly:make-pitch -1 0 0 )) + (cs . ,(ly:make-pitch -1 0 1 )) + (css . ,(ly:make-pitch -1 0 2 )) + (dff . ,(ly:make-pitch -1 1 -2 )) + (df . ,(ly:make-pitch -1 1 -1 )) + (d . ,(ly:make-pitch -1 1 0 )) + (ds . ,(ly:make-pitch -1 1 1 )) + (dss . ,(ly:make-pitch -1 1 2 )) + (eff . ,(ly:make-pitch -1 2 -2 )) + (ef . ,(ly:make-pitch -1 2 -1 )) + (e . ,(ly:make-pitch -1 2 0 )) - (es . ,(make-pitch -1 2 1 )) - (ess . ,(make-pitch -1 2 2 )) - (fff . ,(make-pitch -1 3 -2 )) - (ff . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fs . ,(make-pitch -1 3 1 )) - (fss . ,(make-pitch -1 3 2 )) - (gff . ,(make-pitch -1 4 -2 )) - (gf . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gs . ,(make-pitch -1 4 1 )) - (gss . ,(make-pitch -1 4 2 )) - (aff . ,(make-pitch -1 5 -2 )) - (af . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (as . ,(make-pitch -1 5 1 )) - (ass . ,(make-pitch -1 5 2 )) - (bff . ,(make-pitch -1 6 -2 )) - (bf . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 0 )) - (bs . ,(make-pitch -1 6 1 )) - (bss . ,(make-pitch -1 6 2 )) + (es . ,(ly:make-pitch -1 2 1 )) + (ess . ,(ly:make-pitch -1 2 2 )) + (fff . ,(ly:make-pitch -1 3 -2 )) + (ff . ,(ly:make-pitch -1 3 -1 )) + (f . ,(ly:make-pitch -1 3 0 )) + (fs . ,(ly:make-pitch -1 3 1 )) + (fss . ,(ly:make-pitch -1 3 2 )) + (gff . ,(ly:make-pitch -1 4 -2 )) + (gf . ,(ly:make-pitch -1 4 -1 )) + (g . ,(ly:make-pitch -1 4 0 )) + (gs . ,(ly:make-pitch -1 4 1 )) + (gss . ,(ly:make-pitch -1 4 2 )) + (aff . ,(ly:make-pitch -1 5 -2 )) + (af . ,(ly:make-pitch -1 5 -1 )) + (a . ,(ly:make-pitch -1 5 0 )) + (as . ,(ly:make-pitch -1 5 1 )) + (ass . ,(ly:make-pitch -1 5 2 )) + (bff . ,(ly:make-pitch -1 6 -2 )) + (bf . ,(ly:make-pitch -1 6 -1 )) + (b . ,(ly:make-pitch -1 6 0 )) + (bs . ,(ly:make-pitch -1 6 1 )) + (bss . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index c195c75f97..6ed3450a10 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" % % setup for Request->Element conversion. Guru-only @@ -382,7 +382,7 @@ ScoreContext = \translator { aDueText = #"a2" soloADue = ##t splitInterval = #'(0 . 1) - changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512)) + changeMoment = #`(,(ly:make-moment 0 0) . ,(ly:make-moment 1 512)) systemStartDelimiter =#'SystemStartBar diff --git a/ly/espanol.ly b/ly/espanol.ly index 71391529a1..b5bc18869a 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -13,49 +13,49 @@ % For using "sostingut" notation, which is also correct \pitchnames #`( - (dobb . ,(make-pitch -1 0 -2 )) - (dob . ,(make-pitch -1 0 -1 )) - (do . ,(make-pitch -1 0 0 )) - (dos . ,(make-pitch -1 0 1 )) - (doss . ,(make-pitch -1 0 2 )) - - (rebb . ,(make-pitch -1 1 -2 )) - (reb . ,(make-pitch -1 1 -1 )) - (re . ,(make-pitch -1 1 0 )) - (res . ,(make-pitch -1 1 1 )) - (ress . ,(make-pitch -1 1 2 )) - - (mibb . ,(make-pitch -1 2 -2 )) - (mib . ,(make-pitch -1 2 -1 )) - (mi . ,(make-pitch -1 2 0 )) - (mis . ,(make-pitch -1 2 1 )) - (miss . ,(make-pitch -1 2 2 )) - - (fabb . ,(make-pitch -1 3 -2 )) - (fab . ,(make-pitch -1 3 -1 )) - (fa . ,(make-pitch -1 3 0 )) - (fas . ,(make-pitch -1 3 1 )) - (fass . ,(make-pitch -1 3 2 )) - - (solbb . ,(make-pitch -1 4 -2 )) - (solb . ,(make-pitch -1 4 -1 )) - (sol . ,(make-pitch -1 4 0 )) - (sols . ,(make-pitch -1 4 1 )) - (solss . ,(make-pitch -1 4 2 )) - - (labb . ,(make-pitch -1 5 -2 )) - (lab . ,(make-pitch -1 5 -1 )) - (la . ,(make-pitch -1 5 0 )) - (las . ,(make-pitch -1 5 1 )) - (lass . ,(make-pitch -1 5 2 )) - - (sibb . ,(make-pitch -1 6 -2 )) - (sib . ,(make-pitch -1 6 -1 )) - (si . ,(make-pitch -1 6 0 )) - (sis . ,(make-pitch -1 6 1 )) - (siss . ,(make-pitch -1 6 2 )) + (dobb . ,(ly:make-pitch -1 0 -2 )) + (dob . ,(ly:make-pitch -1 0 -1 )) + (do . ,(ly:make-pitch -1 0 0 )) + (dos . ,(ly:make-pitch -1 0 1 )) + (doss . ,(ly:make-pitch -1 0 2 )) + + (rebb . ,(ly:make-pitch -1 1 -2 )) + (reb . ,(ly:make-pitch -1 1 -1 )) + (re . ,(ly:make-pitch -1 1 0 )) + (res . ,(ly:make-pitch -1 1 1 )) + (ress . ,(ly:make-pitch -1 1 2 )) + + (mibb . ,(ly:make-pitch -1 2 -2 )) + (mib . ,(ly:make-pitch -1 2 -1 )) + (mi . ,(ly:make-pitch -1 2 0 )) + (mis . ,(ly:make-pitch -1 2 1 )) + (miss . ,(ly:make-pitch -1 2 2 )) + + (fabb . ,(ly:make-pitch -1 3 -2 )) + (fab . ,(ly:make-pitch -1 3 -1 )) + (fa . ,(ly:make-pitch -1 3 0 )) + (fas . ,(ly:make-pitch -1 3 1 )) + (fass . ,(ly:make-pitch -1 3 2 )) + + (solbb . ,(ly:make-pitch -1 4 -2 )) + (solb . ,(ly:make-pitch -1 4 -1 )) + (sol . ,(ly:make-pitch -1 4 0 )) + (sols . ,(ly:make-pitch -1 4 1 )) + (solss . ,(ly:make-pitch -1 4 2 )) + + (labb . ,(ly:make-pitch -1 5 -2 )) + (lab . ,(ly:make-pitch -1 5 -1 )) + (la . ,(ly:make-pitch -1 5 0 )) + (las . ,(ly:make-pitch -1 5 1 )) + (lass . ,(ly:make-pitch -1 5 2 )) + + (sibb . ,(ly:make-pitch -1 6 -2 )) + (sib . ,(ly:make-pitch -1 6 -1 )) + (si . ,(ly:make-pitch -1 6 0 )) + (sis . ,(ly:make-pitch -1 6 1 )) + (siss . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index 5068d8e3eb..d860e60024 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,7 +1,7 @@ -\version "1.5.68" +\version "1.7.3" % % Running LilyPond on this file generates the documentation % -#(ly-set-parse-protect #f) +#(ly:set-parse-protect #f) #(load-from-path "generate-documentation.scm") diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly index 048127d6d3..c42991dbeb 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,6 +1,6 @@ -\version "1.5.68" +\version "1.7.3" % % Running LilyPond on this file generates the short interface doc % -#(eval-string (ly-gulp-file "generate-interface-doc.scm")) +#(eval-string (ly:gulp-file "generate-interface-doc.scm")) diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 09db889aca..11fa202be6 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.3" startGraceMusic = { \property Voice.Stem \override #'direction = #1 @@ -69,12 +69,12 @@ and restore afterwards. Use this to add settings to default grace notes. (make-sequential-music (cons (context-spec-music (make-grob-property-revert object prop) context) - (ly-get-mus-property stopGraceMusic 'elements) + (ly:get-mus-property stopGraceMusic 'elements) ))) (set! startGraceMusic (make-sequential-music (append - (ly-get-mus-property startGraceMusic 'elements) + (ly:get-mus-property startGraceMusic 'elements) (list (context-spec-music (make-grob-property-set object prop val) context)) ) ))) diff --git a/ly/italiano.ly b/ly/italiano.ly index abccdc8fa0..b153244d18 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -11,41 +11,41 @@ % contributed by Paolo Zuliani \pitchnames #`( - (dobb . ,(make-pitch -1 0 -2 )) - (dob . ,(make-pitch -1 0 -1 )) - (do . ,(make-pitch -1 0 0 )) - (dod . ,(make-pitch -1 0 1 )) - (dodd . ,(make-pitch -1 0 2 )) - (rebb . ,(make-pitch -1 1 -2 )) - (reb . ,(make-pitch -1 1 -1 )) - (re . ,(make-pitch -1 1 0 )) - (red . ,(make-pitch -1 1 1 )) - (redd . ,(make-pitch -1 1 2 )) - (mibb . ,(make-pitch -1 2 -2 )) - (mib . ,(make-pitch -1 2 -1 )) - (mi . ,(make-pitch -1 2 0 )) - (mid . ,(make-pitch -1 2 1 )) - (midd . ,(make-pitch -1 2 2 )) - (fabb . ,(make-pitch -1 3 -2 )) - (fab . ,(make-pitch -1 3 -1 )) - (fa . ,(make-pitch -1 3 0 )) - (fad . ,(make-pitch -1 3 1 )) - (fadd . ,(make-pitch -1 3 2 )) - (solbb . ,(make-pitch -1 4 -2 )) - (solb . ,(make-pitch -1 4 -1 )) - (sol . ,(make-pitch -1 4 0 )) - (sold . ,(make-pitch -1 4 1 )) - (soldd . ,(make-pitch -1 4 2 )) - (labb . ,(make-pitch -1 5 -2 )) - (lab . ,(make-pitch -1 5 -1 )) - (la . ,(make-pitch -1 5 0 )) - (lad . ,(make-pitch -1 5 1 )) - (ladd . ,(make-pitch -1 5 2 )) - (sibb . ,(make-pitch -1 6 -2 )) - (sib . ,(make-pitch -1 6 -1 )) - (si . ,(make-pitch -1 6 0 )) - (sid . ,(make-pitch -1 6 1 )) - (sidd . ,(make-pitch -1 6 2 )) + (dobb . ,(ly:make-pitch -1 0 -2 )) + (dob . ,(ly:make-pitch -1 0 -1 )) + (do . ,(ly:make-pitch -1 0 0 )) + (dod . ,(ly:make-pitch -1 0 1 )) + (dodd . ,(ly:make-pitch -1 0 2 )) + (rebb . ,(ly:make-pitch -1 1 -2 )) + (reb . ,(ly:make-pitch -1 1 -1 )) + (re . ,(ly:make-pitch -1 1 0 )) + (red . ,(ly:make-pitch -1 1 1 )) + (redd . ,(ly:make-pitch -1 1 2 )) + (mibb . ,(ly:make-pitch -1 2 -2 )) + (mib . ,(ly:make-pitch -1 2 -1 )) + (mi . ,(ly:make-pitch -1 2 0 )) + (mid . ,(ly:make-pitch -1 2 1 )) + (midd . ,(ly:make-pitch -1 2 2 )) + (fabb . ,(ly:make-pitch -1 3 -2 )) + (fab . ,(ly:make-pitch -1 3 -1 )) + (fa . ,(ly:make-pitch -1 3 0 )) + (fad . ,(ly:make-pitch -1 3 1 )) + (fadd . ,(ly:make-pitch -1 3 2 )) + (solbb . ,(ly:make-pitch -1 4 -2 )) + (solb . ,(ly:make-pitch -1 4 -1 )) + (sol . ,(ly:make-pitch -1 4 0 )) + (sold . ,(ly:make-pitch -1 4 1 )) + (soldd . ,(ly:make-pitch -1 4 2 )) + (labb . ,(ly:make-pitch -1 5 -2 )) + (lab . ,(ly:make-pitch -1 5 -1 )) + (la . ,(ly:make-pitch -1 5 0 )) + (lad . ,(ly:make-pitch -1 5 1 )) + (ladd . ,(ly:make-pitch -1 5 2 )) + (sibb . ,(ly:make-pitch -1 6 -2 )) + (sib . ,(ly:make-pitch -1 6 -1 )) + (si . ,(ly:make-pitch -1 6 0 )) + (sid . ,(ly:make-pitch -1 6 1 )) + (sidd . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/ly/nederlands.ly b/ly/nederlands.ly index 35a977c03a..b45c974373 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,48 +1,48 @@ -\version "1.5.68" +\version "1.7.3" %{ common dutch names for notes. es means flat, is means sharp %} \pitchnames #`( - (ceses . ,(make-pitch -1 0 -2)) - (ces . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cis . ,(make-pitch -1 0 1 )) - (cisis . ,(make-pitch -1 0 2 )) - (deses . ,(make-pitch -1 1 -2 )) - (des . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dis . ,(make-pitch -1 1 1 )) - (disis . ,(make-pitch -1 1 2 )) - (eeses . ,(make-pitch -1 2 -2 )) - (eses . ,(make-pitch -1 2 -2 )) - (ees . ,(make-pitch -1 2 -1 )) - (es . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eis . ,(make-pitch -1 2 1 )) - (eisis . ,(make-pitch -1 2 2 )) - (feses . ,(make-pitch -1 3 -2 )) - (fes . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fis . ,(make-pitch -1 3 1 )) - (fisis . ,(make-pitch -1 3 2 )) - (geses . ,(make-pitch -1 4 -2 )) - (ges . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gis . ,(make-pitch -1 4 1 )) - (gisis . ,(make-pitch -1 4 2 )) - (aeses . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) - (aes . ,(make-pitch -1 5 -1 )) - (as . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (ais . ,(make-pitch -1 5 1 )) - (aisis . ,(make-pitch -1 5 2 )) - (beses . ,(make-pitch -1 6 -2 )) - (bes . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 0 )) - (bis . ,(make-pitch -1 6 1 )) - (bisis . ,(make-pitch -1 6 2 )) + (ceses . ,(ly:make-pitch -1 0 -2)) + (ces . ,(ly:make-pitch -1 0 -1 )) + (c . ,(ly:make-pitch -1 0 0 )) + (cis . ,(ly:make-pitch -1 0 1 )) + (cisis . ,(ly:make-pitch -1 0 2 )) + (deses . ,(ly:make-pitch -1 1 -2 )) + (des . ,(ly:make-pitch -1 1 -1 )) + (d . ,(ly:make-pitch -1 1 0 )) + (dis . ,(ly:make-pitch -1 1 1 )) + (disis . ,(ly:make-pitch -1 1 2 )) + (eeses . ,(ly:make-pitch -1 2 -2 )) + (eses . ,(ly:make-pitch -1 2 -2 )) + (ees . ,(ly:make-pitch -1 2 -1 )) + (es . ,(ly:make-pitch -1 2 -1 )) + (e . ,(ly:make-pitch -1 2 0 )) + (eis . ,(ly:make-pitch -1 2 1 )) + (eisis . ,(ly:make-pitch -1 2 2 )) + (feses . ,(ly:make-pitch -1 3 -2 )) + (fes . ,(ly:make-pitch -1 3 -1 )) + (f . ,(ly:make-pitch -1 3 0 )) + (fis . ,(ly:make-pitch -1 3 1 )) + (fisis . ,(ly:make-pitch -1 3 2 )) + (geses . ,(ly:make-pitch -1 4 -2 )) + (ges . ,(ly:make-pitch -1 4 -1 )) + (g . ,(ly:make-pitch -1 4 0 )) + (gis . ,(ly:make-pitch -1 4 1 )) + (gisis . ,(ly:make-pitch -1 4 2 )) + (aeses . ,(ly:make-pitch -1 5 -2 )) + (ases . ,(ly:make-pitch -1 5 -2 )) + (aes . ,(ly:make-pitch -1 5 -1 )) + (as . ,(ly:make-pitch -1 5 -1 )) + (a . ,(ly:make-pitch -1 5 0 )) + (ais . ,(ly:make-pitch -1 5 1 )) + (aisis . ,(ly:make-pitch -1 5 2 )) + (beses . ,(ly:make-pitch -1 6 -2 )) + (bes . ,(ly:make-pitch -1 6 -1 )) + (b . ,(ly:make-pitch -1 6 0 )) + (bis . ,(ly:make-pitch -1 6 1 )) + (bisis . ,(ly:make-pitch -1 6 2 )) ) diff --git a/ly/norsk.ly b/ly/norsk.ly index 5336414861..886506f75e 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -28,80 +28,80 @@ %} \pitchnames #`( - (ceses . ,(make-pitch -1 0 -2 )) - (cessess . ,(make-pitch -1 0 -2 )) - (ces . ,(make-pitch -1 0 -1 )) - (cess . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cis . ,(make-pitch -1 0 1 )) - (ciss . ,(make-pitch -1 0 1 )) - (cisis . ,(make-pitch -1 0 2 )) - (cississ . ,(make-pitch -1 0 2 )) - (deses . ,(make-pitch -1 1 -2 )) - (dessess . ,(make-pitch -1 1 -2 )) - (des . ,(make-pitch -1 1 -1 )) - (dess . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dis . ,(make-pitch -1 1 1 )) - (diss . ,(make-pitch -1 1 1 )) - (disis . ,(make-pitch -1 1 2 )) - (dississ . ,(make-pitch -1 1 2 )) - (eeses . ,(make-pitch -1 2 -2 )) - (eessess . ,(make-pitch -1 2 -2 )) - (eses . ,(make-pitch -1 2 -2 )) - (essess . ,(make-pitch -1 2 -2 )) - (ees . ,(make-pitch -1 2 -1 )) - (eess . ,(make-pitch -1 2 -1 )) - (es . ,(make-pitch -1 2 -1 )) - (ess . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eis . ,(make-pitch -1 2 1 )) - (eiss . ,(make-pitch -1 2 1 )) - (eisis . ,(make-pitch -1 2 2 )) - (eississ . ,(make-pitch -1 2 2 )) - (feses . ,(make-pitch -1 3 -2 )) - (fessess . ,(make-pitch -1 3 -2 )) - (fes . ,(make-pitch -1 3 -1 )) - (fess . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fis . ,(make-pitch -1 3 1 )) - (fiss . ,(make-pitch -1 3 1 )) - (fisis . ,(make-pitch -1 3 2 )) - (fississ . ,(make-pitch -1 3 2 )) - (geses . ,(make-pitch -1 4 -2 )) - (gessess . ,(make-pitch -1 4 -2 )) - (ges . ,(make-pitch -1 4 -1 )) - (gess . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (g . ,(make-pitch -1 4 0 )) - (gis . ,(make-pitch -1 4 1 )) - (giss . ,(make-pitch -1 4 1 )) - (gisis . ,(make-pitch -1 4 2 )) - (gississ . ,(make-pitch -1 4 2 )) - (aeses . ,(make-pitch -1 5 -2 )) - (aessess . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) - (assess . ,(make-pitch -1 5 -2 )) - (aes . ,(make-pitch -1 5 -1 )) - (aess . ,(make-pitch -1 5 -1 )) - (as . ,(make-pitch -1 5 -1 )) - (ass . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (ais . ,(make-pitch -1 5 1 )) - (aiss . ,(make-pitch -1 5 1 )) - (aisis . ,(make-pitch -1 5 2 )) - (aississ . ,(make-pitch -1 5 2 )) - (bes . ,(make-pitch -1 6 -2 )) - (bess . ,(make-pitch -1 6 -2 )) - (b . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 -1 )) - (h . ,(make-pitch -1 6 0 )) - (his . ,(make-pitch -1 6 1 )) - (hiss . ,(make-pitch -1 6 1 )) - (hisis . ,(make-pitch -1 6 2 )) - (hississ . ,(make-pitch -1 6 2 )) + (ceses . ,(ly:make-pitch -1 0 -2 )) + (cessess . ,(ly:make-pitch -1 0 -2 )) + (ces . ,(ly:make-pitch -1 0 -1 )) + (cess . ,(ly:make-pitch -1 0 -1 )) + (c . ,(ly:make-pitch -1 0 0 )) + (cis . ,(ly:make-pitch -1 0 1 )) + (ciss . ,(ly:make-pitch -1 0 1 )) + (cisis . ,(ly:make-pitch -1 0 2 )) + (cississ . ,(ly:make-pitch -1 0 2 )) + (deses . ,(ly:make-pitch -1 1 -2 )) + (dessess . ,(ly:make-pitch -1 1 -2 )) + (des . ,(ly:make-pitch -1 1 -1 )) + (dess . ,(ly:make-pitch -1 1 -1 )) + (d . ,(ly:make-pitch -1 1 0 )) + (dis . ,(ly:make-pitch -1 1 1 )) + (diss . ,(ly:make-pitch -1 1 1 )) + (disis . ,(ly:make-pitch -1 1 2 )) + (dississ . ,(ly:make-pitch -1 1 2 )) + (eeses . ,(ly:make-pitch -1 2 -2 )) + (eessess . ,(ly:make-pitch -1 2 -2 )) + (eses . ,(ly:make-pitch -1 2 -2 )) + (essess . ,(ly:make-pitch -1 2 -2 )) + (ees . ,(ly:make-pitch -1 2 -1 )) + (eess . ,(ly:make-pitch -1 2 -1 )) + (es . ,(ly:make-pitch -1 2 -1 )) + (ess . ,(ly:make-pitch -1 2 -1 )) + (e . ,(ly:make-pitch -1 2 0 )) + (eis . ,(ly:make-pitch -1 2 1 )) + (eiss . ,(ly:make-pitch -1 2 1 )) + (eisis . ,(ly:make-pitch -1 2 2 )) + (eississ . ,(ly:make-pitch -1 2 2 )) + (feses . ,(ly:make-pitch -1 3 -2 )) + (fessess . ,(ly:make-pitch -1 3 -2 )) + (fes . ,(ly:make-pitch -1 3 -1 )) + (fess . ,(ly:make-pitch -1 3 -1 )) + (f . ,(ly:make-pitch -1 3 0 )) + (fis . ,(ly:make-pitch -1 3 1 )) + (fiss . ,(ly:make-pitch -1 3 1 )) + (fisis . ,(ly:make-pitch -1 3 2 )) + (fississ . ,(ly:make-pitch -1 3 2 )) + (geses . ,(ly:make-pitch -1 4 -2 )) + (gessess . ,(ly:make-pitch -1 4 -2 )) + (ges . ,(ly:make-pitch -1 4 -1 )) + (gess . ,(ly:make-pitch -1 4 -1 )) + (g . ,(ly:make-pitch -1 4 0 )) + (g . ,(ly:make-pitch -1 4 0 )) + (gis . ,(ly:make-pitch -1 4 1 )) + (giss . ,(ly:make-pitch -1 4 1 )) + (gisis . ,(ly:make-pitch -1 4 2 )) + (gississ . ,(ly:make-pitch -1 4 2 )) + (aeses . ,(ly:make-pitch -1 5 -2 )) + (aessess . ,(ly:make-pitch -1 5 -2 )) + (ases . ,(ly:make-pitch -1 5 -2 )) + (assess . ,(ly:make-pitch -1 5 -2 )) + (aes . ,(ly:make-pitch -1 5 -1 )) + (aess . ,(ly:make-pitch -1 5 -1 )) + (as . ,(ly:make-pitch -1 5 -1 )) + (ass . ,(ly:make-pitch -1 5 -1 )) + (a . ,(ly:make-pitch -1 5 0 )) + (ais . ,(ly:make-pitch -1 5 1 )) + (aiss . ,(ly:make-pitch -1 5 1 )) + (aisis . ,(ly:make-pitch -1 5 2 )) + (aississ . ,(ly:make-pitch -1 5 2 )) + (bes . ,(ly:make-pitch -1 6 -2 )) + (bess . ,(ly:make-pitch -1 6 -2 )) + (b . ,(ly:make-pitch -1 6 -1 )) + (b . ,(ly:make-pitch -1 6 -1 )) + (h . ,(ly:make-pitch -1 6 0 )) + (his . ,(ly:make-pitch -1 6 1 )) + (hiss . ,(ly:make-pitch -1 6 1 )) + (hisis . ,(ly:make-pitch -1 6 2 )) + (hississ . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/ly/property-init.ly b/ly/property-init.ly index d3a8767fca..c035bfc3dd 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "1.5.68" +\version "1.7.3" stemUp = \property Voice.Stem \set #'direction = #1 stemDown = \property Voice.Stem \set #'direction = #-1 @@ -69,7 +69,7 @@ tupletBoth = { cadenzaOn = \property Timing.timing = ##f cadenzaOff = { \property Timing.timing = ##t - \property Timing.measurePosition = #(make-moment 0 1) + \property Timing.measurePosition = #(ly:make-moment 0 1) } newpage = \notes @@ -80,7 +80,7 @@ newpage = \notes #'between-system-string = #"\\newpage" } -% dynamic dir? text script, articulation script dir? +% dynamic ly:dir? text script, articulation script ly:dir? oneVoice = #(context-spec-music (make-voice-props-revert) "Voice") voiceOne = #(context-spec-music (make-voice-props-set 0) "Voice") voiceTwo = #(context-spec-music (make-voice-props-set 1) "Voice") diff --git a/ly/script-init.ly b/ly/script-init.ly index c2c0e42188..4f5a205dc1 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -10,6 +10,9 @@ dashDot= "staccato" dashUnderscore = "portato" +#(display set-mus-properties!) +#(display make-articulation) + thumb = #(make-articulation "thumb") accent = #(make-articulation "accent") marcato = #(make-articulation "marcato") diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 952e67f620..3f24cf04ea 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,9 +1,9 @@ -\version "1.7.2" +\version "1.7.3" #(define (make-span-event type spandir) (let* ((m (make-music-by-name type))) - (ly-set-mus-property! m 'span-direction spandir) + (ly:set-mus-property! m 'span-direction spandir) m )) @@ -20,7 +20,7 @@ startTextSpan = #(make-span-event 'TextSpanEvent START) stopTextSpan = #(make-span-event 'TextSpanEvent STOP) cresc = \notes { - #(ly-export (make-event-chord (list cr))) + #(ly:export (make-event-chord (list cr))) \property Voice.crescendoText = #'((font-shape . italic) "cresc.") \property Voice.crescendoSpanner = #'dashed-line } @@ -28,20 +28,20 @@ cresc = \notes { % ah, this is handy: maybe drop resetting of properties in % dynamic-engraver ? endcresc = \notes { - #(ly-export (make-event-chord (list rc))) + #(ly:export (make-event-chord (list rc))) \property Voice.crescendoText \unset \property Voice.crescendoSpanner \unset } dim = \notes { - #(ly-export (make-event-chord (list decr))) + #(ly:export (make-event-chord (list decr))) \property Voice.decrescendoText = #"dim." \property Voice.decrescendoSpanner = #'dashed-line } enddim = \notes { - #(ly-export (make-event-chord (list rced))) + #(ly:export (make-event-chord (list rced))) \property Voice.decrescendoText \unset \property Voice.decrescendoSpanner \unset } diff --git a/ly/suomi.ly b/ly/suomi.ly index b0c85f7927..6f2558a732 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -7,42 +7,42 @@ % added bb and marked heses as `unusual' \pitchnames #`( - (ceses . ,(make-pitch -1 0 -2 )) - (ces . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cis . ,(make-pitch -1 0 1 )) - (cisis . ,(make-pitch -1 0 2 )) - (deses . ,(make-pitch -1 1 -2 )) - (des . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dis . ,(make-pitch -1 1 1 )) - (disis . ,(make-pitch -1 1 2 )) - (eses . ,(make-pitch -1 2 -2 )) - (es . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eis . ,(make-pitch -1 2 1 )) - (eisis . ,(make-pitch -1 2 2 )) - (feses . ,(make-pitch -1 3 -2 )) - (fes . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fis . ,(make-pitch -1 3 1 )) - (fisis . ,(make-pitch -1 3 2 )) - (geses . ,(make-pitch -1 4 -2 )) - (ges . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gis . ,(make-pitch -1 4 1 )) - (gisis . ,(make-pitch -1 4 2 )) - (asas . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) ;;non-standard name for asas - (as . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (ais . ,(make-pitch -1 5 1 )) - (aisis . ,(make-pitch -1 5 2 )) - (bb . ,(make-pitch -1 6 -2 )) - (heses . ,(make-pitch -1 6 -2 )) ;;non-standard name for bb - (b . ,(make-pitch -1 6 -1 )) - (h . ,(make-pitch -1 6 0 )) - (his . ,(make-pitch -1 6 1 )) - (hisis . ,(make-pitch -1 6 2 )) + (ceses . ,(ly:make-pitch -1 0 -2 )) + (ces . ,(ly:make-pitch -1 0 -1 )) + (c . ,(ly:make-pitch -1 0 0 )) + (cis . ,(ly:make-pitch -1 0 1 )) + (cisis . ,(ly:make-pitch -1 0 2 )) + (deses . ,(ly:make-pitch -1 1 -2 )) + (des . ,(ly:make-pitch -1 1 -1 )) + (d . ,(ly:make-pitch -1 1 0 )) + (dis . ,(ly:make-pitch -1 1 1 )) + (disis . ,(ly:make-pitch -1 1 2 )) + (eses . ,(ly:make-pitch -1 2 -2 )) + (es . ,(ly:make-pitch -1 2 -1 )) + (e . ,(ly:make-pitch -1 2 0 )) + (eis . ,(ly:make-pitch -1 2 1 )) + (eisis . ,(ly:make-pitch -1 2 2 )) + (feses . ,(ly:make-pitch -1 3 -2 )) + (fes . ,(ly:make-pitch -1 3 -1 )) + (f . ,(ly:make-pitch -1 3 0 )) + (fis . ,(ly:make-pitch -1 3 1 )) + (fisis . ,(ly:make-pitch -1 3 2 )) + (geses . ,(ly:make-pitch -1 4 -2 )) + (ges . ,(ly:make-pitch -1 4 -1 )) + (g . ,(ly:make-pitch -1 4 0 )) + (gis . ,(ly:make-pitch -1 4 1 )) + (gisis . ,(ly:make-pitch -1 4 2 )) + (asas . ,(ly:make-pitch -1 5 -2 )) + (ases . ,(ly:make-pitch -1 5 -2 )) ;;non-standard name for asas + (as . ,(ly:make-pitch -1 5 -1 )) + (a . ,(ly:make-pitch -1 5 0 )) + (ais . ,(ly:make-pitch -1 5 1 )) + (aisis . ,(ly:make-pitch -1 5 2 )) + (bb . ,(ly:make-pitch -1 6 -2 )) + (heses . ,(ly:make-pitch -1 6 -2 )) ;;non-standard name for bb + (b . ,(ly:make-pitch -1 6 -1 )) + (h . ,(ly:make-pitch -1 6 0 )) + (his . ,(ly:make-pitch -1 6 1 )) + (hisis . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/ly/svenska.ly b/ly/svenska.ly index 2476e46022..a81155566a 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -4,40 +4,40 @@ % by Mats Bengtsson. \pitchnames #`( - (cessess . ,(make-pitch -1 0 -2 )) - (cess . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (ciss . ,(make-pitch -1 0 1 )) - (cississ . ,(make-pitch -1 0 2 )) - (dessess . ,(make-pitch -1 1 -2 )) - (dess . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (diss . ,(make-pitch -1 1 1 )) - (dississ . ,(make-pitch -1 1 2 )) - (essess . ,(make-pitch -1 2 -2 )) - (ess . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eiss . ,(make-pitch -1 2 1 )) - (eississ . ,(make-pitch -1 2 2 )) - (fessess . ,(make-pitch -1 3 -2 )) - (fess . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fiss . ,(make-pitch -1 3 1 )) - (fississ . ,(make-pitch -1 3 2 )) - (gessess . ,(make-pitch -1 4 -2 )) - (gess . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (giss . ,(make-pitch -1 4 1 )) - (gississ . ,(make-pitch -1 4 2 )) - (assess . ,(make-pitch -1 5 -2 )) - (ass . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (aiss . ,(make-pitch -1 5 1 )) - (aississ . ,(make-pitch -1 5 2 )) - (hessess . ,(make-pitch -1 6 -2 )) - (b . ,(make-pitch -1 6 -1 )) - (h . ,(make-pitch -1 6 0 )) - (hiss . ,(make-pitch -1 6 1 )) - (hississ . ,(make-pitch -1 6 2 )) + (cessess . ,(ly:make-pitch -1 0 -2 )) + (cess . ,(ly:make-pitch -1 0 -1 )) + (c . ,(ly:make-pitch -1 0 0 )) + (ciss . ,(ly:make-pitch -1 0 1 )) + (cississ . ,(ly:make-pitch -1 0 2 )) + (dessess . ,(ly:make-pitch -1 1 -2 )) + (dess . ,(ly:make-pitch -1 1 -1 )) + (d . ,(ly:make-pitch -1 1 0 )) + (diss . ,(ly:make-pitch -1 1 1 )) + (dississ . ,(ly:make-pitch -1 1 2 )) + (essess . ,(ly:make-pitch -1 2 -2 )) + (ess . ,(ly:make-pitch -1 2 -1 )) + (e . ,(ly:make-pitch -1 2 0 )) + (eiss . ,(ly:make-pitch -1 2 1 )) + (eississ . ,(ly:make-pitch -1 2 2 )) + (fessess . ,(ly:make-pitch -1 3 -2 )) + (fess . ,(ly:make-pitch -1 3 -1 )) + (f . ,(ly:make-pitch -1 3 0 )) + (fiss . ,(ly:make-pitch -1 3 1 )) + (fississ . ,(ly:make-pitch -1 3 2 )) + (gessess . ,(ly:make-pitch -1 4 -2 )) + (gess . ,(ly:make-pitch -1 4 -1 )) + (g . ,(ly:make-pitch -1 4 0 )) + (giss . ,(ly:make-pitch -1 4 1 )) + (gississ . ,(ly:make-pitch -1 4 2 )) + (assess . ,(ly:make-pitch -1 5 -2 )) + (ass . ,(ly:make-pitch -1 5 -1 )) + (a . ,(ly:make-pitch -1 5 0 )) + (aiss . ,(ly:make-pitch -1 5 1 )) + (aississ . ,(ly:make-pitch -1 5 2 )) + (hessess . ,(ly:make-pitch -1 6 -2 )) + (b . ,(ly:make-pitch -1 6 -1 )) + (h . ,(ly:make-pitch -1 6 0 )) + (hiss . ,(ly:make-pitch -1 6 1 )) + (hississ . ,(ly:make-pitch -1 6 2 )) ) -\version "1.5.68" +\version "1.7.3" diff --git a/scm/ascii-script.scm b/scm/ascii-script.scm index d25c819468..c964fcf52f 100644 --- a/scm/ascii-script.scm +++ b/scm/ascii-script.scm @@ -197,7 +197,7 @@ (let* ((c (assoc name-mag-pair font-name-alist))) (if (eq? c #f) (begin - (ly-warn + (ly:warn (string-append "Programming error: No such font known " (car name-mag-pair)))) diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 0a6d94b195..8f689124e7 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -30,55 +30,55 @@ (define-public auto-beam-settings `( - ((end * * 3 2) . ,(make-moment 1 2)) - ((end 1 16 3 2) . ,(make-moment 1 4)) - ((end 1 32 3 2) . ,(make-moment 1 8)) + ((end * * 3 2) . ,(ly:make-moment 1 2)) + ((end 1 16 3 2) . ,(ly:make-moment 1 4)) + ((end 1 32 3 2) . ,(ly:make-moment 1 8)) - ((begin 1 8 3 4) . ,(make-moment 1 4)) + ((begin 1 8 3 4) . ,(ly:make-moment 1 4)) - ((end * * 3 4) . ,(make-moment 3 4)) - ((begin 1 16 3 4) . ,(make-moment 1 16)) - ((end 1 16 3 4) . ,(make-moment 1 4)) - ;;((begin 1 32 3 4) . ,(make-moment 1 8)) - ((end 1 32 3 4) . ,(make-moment 1 8)) + ((end * * 3 4) . ,(ly:make-moment 3 4)) + ((begin 1 16 3 4) . ,(ly:make-moment 1 16)) + ((end 1 16 3 4) . ,(ly:make-moment 1 4)) + ;;((begin 1 32 3 4) . ,(ly:make-moment 1 8)) + ((end 1 32 3 4) . ,(ly:make-moment 1 8)) - ((begin 1 16 3 8) . ,(make-moment 1 8)) - ((end * * 3 8) . ,(make-moment 3 8)) + ((begin 1 16 3 8) . ,(ly:make-moment 1 8)) + ((end * * 3 8) . ,(ly:make-moment 3 8)) ;; in common time: ;; end beams each 1 2 note ;; end beams with 32th notes each 1 8 note ;; end beams with 1 8 triplets each 1 4 note - ((end * * 4 4) . ,(make-moment 1 2)) - ((end 1 12 4 4) . ,(make-moment 1 4)) - ((end 1 16 4 4) . ,(make-moment 1 4)) - ((end 1 32 4 4) . ,(make-moment 1 8)) + ((end * * 4 4) . ,(ly:make-moment 1 2)) + ((end 1 12 4 4) . ,(ly:make-moment 1 4)) + ((end 1 16 4 4) . ,(ly:make-moment 1 4)) + ((end 1 32 4 4) . ,(ly:make-moment 1 8)) - ((end * * 2 4) . ,(make-moment 1 4)) - ((end 1 12 2 4) . ,(make-moment 1 4)) - ((end 1 16 2 4) . ,(make-moment 1 4)) - ((end 1 32 2 4) . ,(make-moment 1 8)) + ((end * * 2 4) . ,(ly:make-moment 1 4)) + ((end 1 12 2 4) . ,(ly:make-moment 1 4)) + ((end 1 16 2 4) . ,(ly:make-moment 1 4)) + ((end 1 32 2 4) . ,(ly:make-moment 1 8)) ;; It seems that, because of a bug in the previous auto-beamer, ;; we had the effect of this setting x - ;; ((end * * 2 8) . ,(make-moment 2 8)) + ;; ((end * * 2 8) . ,(ly:make-moment 2 8)) - ((end * * 4 8) . ,(make-moment 1 4)) - ((end 1 16 4 8) . ,(make-moment 1 4)) - ((end 1 32 4 8) . ,(make-moment 1 8)) + ((end * * 4 8) . ,(ly:make-moment 1 4)) + ((end 1 16 4 8) . ,(ly:make-moment 1 4)) + ((end 1 32 4 8) . ,(ly:make-moment 1 8)) - ((end * * 4 16) . ,(make-moment 1 8)) + ((end * * 4 16) . ,(ly:make-moment 1 8)) - ((end * * 6 8) . ,(make-moment 3 8)) - ((end 1 16 6 8) . ,(make-moment 3 8)) - ((end 1 32 6 8) . ,(make-moment 1 8)) + ((end * * 6 8) . ,(ly:make-moment 3 8)) + ((end 1 16 6 8) . ,(ly:make-moment 3 8)) + ((end 1 32 6 8) . ,(ly:make-moment 1 8)) - ((end * * 9 8) . ,(make-moment 3 8)) - ((end 1 16 9 8) . ,(make-moment 3 8)) - ((end 1 32 9 8) . ,(make-moment 1 8)) + ((end * * 9 8) . ,(ly:make-moment 3 8)) + ((end 1 16 9 8) . ,(ly:make-moment 3 8)) + ((end 1 32 9 8) . ,(ly:make-moment 1 8)) - ((end * * 12 8) . ,(make-moment 3 8)) - ((end 1 16 12 8) . ,(make-moment 3 8)) - ((end 1 32 12 8) . ,(make-moment 1 8)) + ((end * * 12 8) . ,(ly:make-moment 3 8)) + ((end 1 16 12 8) . ,(ly:make-moment 3 8)) + ((end 1 32 12 8) . ,(ly:make-moment 1 8)) )) diff --git a/scm/backend-documentation-lib.scm b/scm/backend-documentation-lib.scm index 5033fb7157..c5175f20df 100644 --- a/scm/backend-documentation-lib.scm +++ b/scm/backend-documentation-lib.scm @@ -112,7 +112,7 @@ node." (engravers (filter-list (lambda (x) (engraver-makes-grob? name x)) all-engravers-list)) (namestr (symbol->string name)) - (engraver-names (map ly-translator-name engravers)) + (engraver-names (map ly:translator-name engravers)) ) (make @@ -138,7 +138,7 @@ node." (lambda (key val prior) (cons (cons key val) prior) ) - '() (ly-all-grob-interfaces))) + '() (ly:all-grob-interfaces))) (set! interface-description-alist (sort interface-description-alist aliststring fig))) - (ly-align-to! mol Y CENTER) + (ly:align-to! mol Y CENTER) )) (if (number? acc) (set! mol - (ly-combine-molecule-at-edge - mol 0 1 (ly-find-glyph-by-name mf (string-append "accidentals-" (number->string acc))) + (ly:combine-molecule-at-edge + mol 0 1 (ly:find-glyph-by-name mf (string-append "accidentals-" (number->string acc))) 0.2)) ) - (if (molecule? mol) - (ly-align-to! mol X CENTER) + (if (ly:molecule? mol) + (ly:align-to! mol X CENTER) ) mol)) (define (brew-bass-figure grob) "Make a molecule for a Figured Bass grob" (let* ( - (figs (ly-get-grob-property grob 'causes )) - (mol (ly-make-molecule '() '(0 . 0) '(0 . 0))) - (padding (ly-get-grob-property grob 'padding)) - (kerning (ly-get-grob-property grob 'kern)) + (figs (ly:get-grob-property grob 'causes )) + (mol (ly:make-molecule '() '(0 . 0) '(0 . 0))) + (padding (ly:get-grob-property grob 'padding)) + (kerning (ly:get-grob-property grob 'kern)) (thickness (* - (ly-get-paper-variable grob 'linethickness) - (ly-get-grob-property grob 'thickness)) + (ly:get-paper-variable grob 'linethickness) + (ly:get-grob-property grob 'thickness)) ) ) (define (brew-complete-figure grob figs mol) "recursive function: take some stuff from FIGS, and add it to MOL." (define (end-bracket? fig) - (eq? (ly-get-mus-property fig 'bracket-stop) #t) + (eq? (ly:get-mus-property fig 'bracket-stop) #t) ) (if (null? figs) mol - (if (eq? (ly-get-mus-property (car figs) 'bracket-start) #t) + (if (eq? (ly:get-mus-property (car figs) 'bracket-start) #t) (let* ( (gather-todo (take-from-list-until figs '() end-bracket?)) (unbr-mols @@ -63,24 +63,24 @@ ) (brew-complete-figure grob (cdr gather-todo) - (ly-combine-molecule-at-edge mol Y UP br-mol kerning) + (ly:combine-molecule-at-edge mol Y UP br-mol kerning) ) ) (brew-complete-figure grob (cdr figs) - (ly-combine-molecule-at-edge mol Y UP (brew-one-figure grob (car figs)) + (ly:combine-molecule-at-edge mol Y UP (brew-one-figure grob (car figs)) kerning)) ) )) (set! mol (brew-complete-figure grob (reverse figs) mol)) - (ly-align-to! mol Y DOWN) + (ly:align-to! mol Y DOWN) mol )) -(ly-add-interface +(ly:add-interface 'bass-figure-interface "A bass figure, including bracket" '(padding thickness )) diff --git a/scm/c++.scm b/scm/c++.scm index b17bfecf92..d9ac2d5339 100644 --- a/scm/c++.scm +++ b/scm/c++.scm @@ -14,7 +14,7 @@ (and (pair? x) (number? (car x)) (number? (cdr x)))) (define-public (number-or-grob? x) - (or (ly-grob? x) (number? x)) + (or (ly:grob? x) (number? x)) ) (define-public (grob-list? x) @@ -22,7 +22,7 @@ (define-public (moment-pair? x) (and (pair? x) - (moment? (car x)) (moment? (cdr x)))) + (ly:moment? (car x)) (ly:moment? (cdr x)))) (define-public (boolean-or-symbol? x) (or (boolean? x) (symbol? x))) @@ -39,23 +39,23 @@ ;; (define type-p-name-alist `( - (,dir? . "direction") + (,ly:dir? . "direction") (,scheme? . "any type") (,number-pair? . "pair of numbers") - (,ly-input-location? . "input location") - (,ly-grob? . "grob (GRaphical OBject)") + (,ly:input-location? . "input location") + (,ly:grob? . "grob (GRaphical OBject)") (,grob-list? . "list of grobs") - (,duration? . "duration") + (,ly:duration? . "duration") (,pair? . "pair") (,integer? . "integer") (,list? . "list") (,symbol? . "symbol") (,string? . "string") (,boolean? . "boolean") - (,moment? . "moment") - (,ly-input-location? . "input location") + (,ly:moment? . "moment") + (,ly:input-location? . "input location") (,music-list? . "list of music") - (,music? . "music") + (,ly:music? . "music") (,number? . "number") (,char? . "char") (,input-port? . "input port") diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 580501d3b3..1cb89d89a2 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -331,8 +331,8 @@ b+i-text))) (define (c++-pitch->scm p) - (if (pitch? p) - (list (pitch-octave p) (pitch-notename p) (pitch-alteration p)) + (if (ly:pitch? p) + (list (ly:pitch-octave p) (ly:pitch-notename p) (ly:pitch-alteration p)) #f)) (define-public (chord::name-banter tonic exception-part unmatched-steps diff --git a/scm/clef.scm b/scm/clef.scm index e0aae19639..997ef4c05c 100644 --- a/scm/clef.scm +++ b/scm/clef.scm @@ -96,7 +96,7 @@ (m (make-music-by-name 'PropertySet)) ) - (map (lambda (x) (ly-set-mus-property! m (car x) (cdr x))) props) + (map (lambda (x) (ly:set-mus-property! m (car x) (cdr x))) props) m )) @@ -140,14 +140,14 @@ (csp (make-music-by-name 'ContextSpeccedMusic)) ) - (ly-set-mus-property! seq 'elements musics) - (ly-set-mus-property! csp 'element seq) - (ly-set-mus-property! csp 'context-type "Staff") + (ly:set-mus-property! seq 'elements musics) + (ly:set-mus-property! csp 'element seq) + (ly:set-mus-property! csp 'context-type "Staff") csp ) (begin - (ly-warn (format "Unknown clef type `~a' + (ly:warn (format "Unknown clef type `~a' See scm/lily.scm for supported clefs" cl)) (make-music-by-name 'Music) diff --git a/scm/drums.scm b/scm/drums.scm index 7ccdc7dd02..6c8838c5dc 100644 --- a/scm/drums.scm +++ b/scm/drums.scm @@ -6,159 +6,159 @@ ;; ugh. Should make separate module? (define-public drum-pitch-names `( - (acousticbassdrum bda ,(make-pitch -3 6 0 )) - (bassdrum bd ,(make-pitch -2 0 0 )) - (hisidestick ssh ,(make-pitch -3 6 2)) - (sidestick ss ,(make-pitch -2 0 1)) - (losidestick ssl ,(make-pitch -2 1 -1)) - (acousticsnare sna ,(make-pitch -2 1 0)) - (snare sn ,(make-pitch -2 2 -2)) - (handclap hc ,(make-pitch -2 1 1)) - (electricsnare sne ,(make-pitch -2 2 0)) - (lowfloortom tomfl ,(make-pitch -2 3 0)) - (closedhihat hhc ,(make-pitch -2 3 1)) - (hihat hh ,(make-pitch -2 4 -1)) - (highfloortom tomfh ,(make-pitch -2 4 0)) - (pedalhihat hhp ,(make-pitch -2 4 1)) - (lowtom toml ,(make-pitch -2 5 0)) - (openhihat hho ,(make-pitch -2 5 1)) - (halfopenhihat hhho ,(make-pitch -2 5 1)) - (lowmidtom tomml ,(make-pitch -2 6 0)) - (himidtom tommh ,(make-pitch -1 0 0)) - (crashcymbala cymca ,(make-pitch -1 0 1)) - (crashcymbal cymc ,(make-pitch -1 1 -1)) - (hightom tomh ,(make-pitch -1 1 0)) - (ridecymbala cymra ,(make-pitch -1 1 1)) - (ridecymbal cymr ,(make-pitch -1 2 -1)) - (chinesecymbal cymch ,(make-pitch -1 2 0)) - (ridebell rb ,(make-pitch -1 3 0)) - (tambourine tamb ,(make-pitch -1 3 1)) - (splashcymbal cyms ,(make-pitch -1 4 0)) - (cowbell cb ,(make-pitch -1 4 1)) - (crashcymbalb cymcb ,(make-pitch -1 5 0)) - (vibraslap vibs ,(make-pitch -1 5 1)) - (ridecymbalb cymrb ,(make-pitch -1 6 0)) - (mutehibongo bohm ,(make-pitch -1 6 1)) - (hibongo boh ,(make-pitch 0 0 0)) - (openhibongo boho ,(make-pitch 0 1 -2)) - (mutelobongo bolm ,(make-pitch -1 6 2)) - (lobongo bol ,(make-pitch 0 0 1)) - (openlobongo bolo ,(make-pitch 0 1 -1)) - (mutehiconga cghm ,(make-pitch 0 1 0)) - (muteloconga cglm ,(make-pitch 0 2 -2)) - (openhiconga cgho ,(make-pitch 0 1 1)) - (hiconga cgh ,(make-pitch 0 2 -1)) - (openloconga cglo ,(make-pitch 0 1 2)) - (loconga cgl ,(make-pitch 0 2 0)) - (hitimbale timh ,(make-pitch 0 3 0)) - (lotimbale timl ,(make-pitch 0 3 1)) - (hiagogo agh ,(make-pitch 0 4 0)) - (loagogo agl ,(make-pitch 0 4 1)) - (cabasa cab ,(make-pitch 0 5 0)) - (maracas mar ,(make-pitch 0 5 1)) - (shortwhistle whs ,(make-pitch 0 6 0)) - (longwhistle whl ,(make-pitch 1 0 0)) - (shortguiro guis ,(make-pitch 1 0 1)) - (longguiro guil ,(make-pitch 1 1 0)) - (guiro gui ,(make-pitch 1 0 2)) - (claves cl ,(make-pitch 1 1 1)) - (hiwoodblock wbh ,(make-pitch 1 2 0)) - (lowoodblock wbl ,(make-pitch 1 3 0)) - (mutecuica cuim ,(make-pitch 1 3 1)) - (opencuica cuio ,(make-pitch 1 4 0)) - (mutetriangle trim ,(make-pitch 1 4 1)) - (triangle tri ,(make-pitch 1 4 2)) - (opentriangle trio ,(make-pitch 1 5 0)) + (acousticbassdrum bda ,(ly:make-pitch -3 6 0 )) + (bassdrum bd ,(ly:make-pitch -2 0 0 )) + (hisidestick ssh ,(ly:make-pitch -3 6 2)) + (sidestick ss ,(ly:make-pitch -2 0 1)) + (losidestick ssl ,(ly:make-pitch -2 1 -1)) + (acousticsnare sna ,(ly:make-pitch -2 1 0)) + (snare sn ,(ly:make-pitch -2 2 -2)) + (handclap hc ,(ly:make-pitch -2 1 1)) + (electricsnare sne ,(ly:make-pitch -2 2 0)) + (lowfloortom tomfl ,(ly:make-pitch -2 3 0)) + (closedhihat hhc ,(ly:make-pitch -2 3 1)) + (hihat hh ,(ly:make-pitch -2 4 -1)) + (highfloortom tomfh ,(ly:make-pitch -2 4 0)) + (pedalhihat hhp ,(ly:make-pitch -2 4 1)) + (lowtom toml ,(ly:make-pitch -2 5 0)) + (openhihat hho ,(ly:make-pitch -2 5 1)) + (halfopenhihat hhho ,(ly:make-pitch -2 5 1)) + (lowmidtom tomml ,(ly:make-pitch -2 6 0)) + (himidtom tommh ,(ly:make-pitch -1 0 0)) + (crashcymbala cymca ,(ly:make-pitch -1 0 1)) + (crashcymbal cymc ,(ly:make-pitch -1 1 -1)) + (hightom tomh ,(ly:make-pitch -1 1 0)) + (ridecymbala cymra ,(ly:make-pitch -1 1 1)) + (ridecymbal cymr ,(ly:make-pitch -1 2 -1)) + (chinesecymbal cymch ,(ly:make-pitch -1 2 0)) + (ridebell rb ,(ly:make-pitch -1 3 0)) + (tambourine tamb ,(ly:make-pitch -1 3 1)) + (splashcymbal cyms ,(ly:make-pitch -1 4 0)) + (cowbell cb ,(ly:make-pitch -1 4 1)) + (crashcymbalb cymcb ,(ly:make-pitch -1 5 0)) + (vibraslap vibs ,(ly:make-pitch -1 5 1)) + (ridecymbalb cymrb ,(ly:make-pitch -1 6 0)) + (mutehibongo bohm ,(ly:make-pitch -1 6 1)) + (hibongo boh ,(ly:make-pitch 0 0 0)) + (openhibongo boho ,(ly:make-pitch 0 1 -2)) + (mutelobongo bolm ,(ly:make-pitch -1 6 2)) + (lobongo bol ,(ly:make-pitch 0 0 1)) + (openlobongo bolo ,(ly:make-pitch 0 1 -1)) + (mutehiconga cghm ,(ly:make-pitch 0 1 0)) + (muteloconga cglm ,(ly:make-pitch 0 2 -2)) + (openhiconga cgho ,(ly:make-pitch 0 1 1)) + (hiconga cgh ,(ly:make-pitch 0 2 -1)) + (openloconga cglo ,(ly:make-pitch 0 1 2)) + (loconga cgl ,(ly:make-pitch 0 2 0)) + (hitimbale timh ,(ly:make-pitch 0 3 0)) + (lotimbale timl ,(ly:make-pitch 0 3 1)) + (hiagogo agh ,(ly:make-pitch 0 4 0)) + (loagogo agl ,(ly:make-pitch 0 4 1)) + (cabasa cab ,(ly:make-pitch 0 5 0)) + (maracas mar ,(ly:make-pitch 0 5 1)) + (shortwhistle whs ,(ly:make-pitch 0 6 0)) + (longwhistle whl ,(ly:make-pitch 1 0 0)) + (shortguiro guis ,(ly:make-pitch 1 0 1)) + (longguiro guil ,(ly:make-pitch 1 1 0)) + (guiro gui ,(ly:make-pitch 1 0 2)) + (claves cl ,(ly:make-pitch 1 1 1)) + (hiwoodblock wbh ,(ly:make-pitch 1 2 0)) + (lowoodblock wbl ,(ly:make-pitch 1 3 0)) + (mutecuica cuim ,(ly:make-pitch 1 3 1)) + (opencuica cuio ,(ly:make-pitch 1 4 0)) + (mutetriangle trim ,(ly:make-pitch 1 4 1)) + (triangle tri ,(ly:make-pitch 1 4 2)) + (opentriangle trio ,(ly:make-pitch 1 5 0)) ;; "transposing" pitches: - (oneup ua ,(make-pitch 0 1 0)) - (twoup ub ,(make-pitch 0 2 0)) - (threeup uc ,(make-pitch 0 3 0)) - (fourup ud ,(make-pitch 0 4 0)) - (fiveup ue ,(make-pitch 0 5 0)) - (onedown da ,(make-pitch -1 6 0)) - (twodown db ,(make-pitch -1 5 0)) - (threedown dc ,(make-pitch -1 4 0)) - (fourdown dd ,(make-pitch -1 3 0)) - (fivedown de ,(make-pitch -1 2 0)) + (oneup ua ,(ly:make-pitch 0 1 0)) + (twoup ub ,(ly:make-pitch 0 2 0)) + (threeup uc ,(ly:make-pitch 0 3 0)) + (fourup ud ,(ly:make-pitch 0 4 0)) + (fiveup ue ,(ly:make-pitch 0 5 0)) + (onedown da ,(ly:make-pitch -1 6 0)) + (twodown db ,(ly:make-pitch -1 5 0)) + (threedown dc ,(ly:make-pitch -1 4 0)) + (fourdown dd ,(ly:make-pitch -1 3 0)) + (fivedown de ,(ly:make-pitch -1 2 0)) )) (define-public drums `( - (acousticbassdrum default #f ,(make-pitch -1 4 0)) - (bassdrum default #f ,(make-pitch -1 4 0)) - (sidestick cross #f ,(make-pitch 0 1 0)) - (acousticsnare default #f ,(make-pitch 0 1 0)) - (snare default #f ,(make-pitch 0 1 0)) - (handclap triangle #f ,(make-pitch 0 1 0)) - (electricsnare default #f ,(make-pitch 0 1 0)) - (lowfloortom default #f ,(make-pitch -1 3 0)) - (closedhihat cross "stopped" ,(make-pitch 0 3 0)) - (hihat cross #f ,(make-pitch 0 3 0)) - (highfloortom default #f ,(make-pitch -1 5 0)) - (pedalhihat cross #f ,(make-pitch -1 2 0)) - (lowtom default #f ,(make-pitch -1 6 0)) - (openhihat cross "open" ,(make-pitch 0 3 0)) - (halfopenhihat xcircle #f ,(make-pitch 0 3 0)) - (lowmidtom default #f ,(make-pitch 0 0 0)) - (himidtom default #f ,(make-pitch 0 2 0)) - (crashcymbala xcircle #f ,(make-pitch 0 5 0)) - (crashcymbal xcircle #f ,(make-pitch 0 5 0)) - (hightom default #f ,(make-pitch 0 4 0)) - (ridecymbala cross #f ,(make-pitch 0 5 0)) - (ridecymbal cross #f ,(make-pitch 0 5 0)) - (chinesecymbal mensural #f ,(make-pitch 0 5 0)) - (ridebell default #f ,(make-pitch 0 5 0)) - (splashcymbal diamond #f ,(make-pitch 0 5 0)) - (cowbell triangle #f ,(make-pitch 0 5 0)) - (crashcymbalb cross #f ,(make-pitch 0 5 0)) - (vibraslap diamond #f ,(make-pitch 0 4 0)) - (ridecymbalb cross #f ,(make-pitch 0 5 0)) + (acousticbassdrum default #f ,(ly:make-pitch -1 4 0)) + (bassdrum default #f ,(ly:make-pitch -1 4 0)) + (sidestick cross #f ,(ly:make-pitch 0 1 0)) + (acousticsnare default #f ,(ly:make-pitch 0 1 0)) + (snare default #f ,(ly:make-pitch 0 1 0)) + (handclap triangle #f ,(ly:make-pitch 0 1 0)) + (electricsnare default #f ,(ly:make-pitch 0 1 0)) + (lowfloortom default #f ,(ly:make-pitch -1 3 0)) + (closedhihat cross "stopped" ,(ly:make-pitch 0 3 0)) + (hihat cross #f ,(ly:make-pitch 0 3 0)) + (highfloortom default #f ,(ly:make-pitch -1 5 0)) + (pedalhihat cross #f ,(ly:make-pitch -1 2 0)) + (lowtom default #f ,(ly:make-pitch -1 6 0)) + (openhihat cross "open" ,(ly:make-pitch 0 3 0)) + (halfopenhihat xcircle #f ,(ly:make-pitch 0 3 0)) + (lowmidtom default #f ,(ly:make-pitch 0 0 0)) + (himidtom default #f ,(ly:make-pitch 0 2 0)) + (crashcymbala xcircle #f ,(ly:make-pitch 0 5 0)) + (crashcymbal xcircle #f ,(ly:make-pitch 0 5 0)) + (hightom default #f ,(ly:make-pitch 0 4 0)) + (ridecymbala cross #f ,(ly:make-pitch 0 5 0)) + (ridecymbal cross #f ,(ly:make-pitch 0 5 0)) + (chinesecymbal mensural #f ,(ly:make-pitch 0 5 0)) + (ridebell default #f ,(ly:make-pitch 0 5 0)) + (splashcymbal diamond #f ,(ly:make-pitch 0 5 0)) + (cowbell triangle #f ,(ly:make-pitch 0 5 0)) + (crashcymbalb cross #f ,(ly:make-pitch 0 5 0)) + (vibraslap diamond #f ,(ly:make-pitch 0 4 0)) + (ridecymbalb cross #f ,(ly:make-pitch 0 5 0)) )) (define-public timbales `( - (losidestick cross #f ,(make-pitch -1 6 0)) - (lotimbale default #f ,(make-pitch -1 6 0)) - (cowbell triangle #f ,(make-pitch 0 2 0)) - (hisidestick cross #f ,(make-pitch 0 1 0)) - (hitimbale default #f ,(make-pitch 0 1 0)) + (losidestick cross #f ,(ly:make-pitch -1 6 0)) + (lotimbale default #f ,(ly:make-pitch -1 6 0)) + (cowbell triangle #f ,(ly:make-pitch 0 2 0)) + (hisidestick cross #f ,(ly:make-pitch 0 1 0)) + (hitimbale default #f ,(ly:make-pitch 0 1 0)) )) (define-public congas `( - (losidestick cross #f ,(make-pitch -1 6 0)) - (loconga default #f ,(make-pitch -1 6 0)) - (openloconga default "open" ,(make-pitch -1 6 0)) - (muteloconga default "stopped" ,(make-pitch -1 6 0)) - (hisidestick cross #f ,(make-pitch 0 1 0)) - (hiconga default #f ,(make-pitch 0 1 0)) - (openhiconga default "open" ,(make-pitch 0 1 0)) - (mutehiconga default "stopped" ,(make-pitch 0 1 0)) + (losidestick cross #f ,(ly:make-pitch -1 6 0)) + (loconga default #f ,(ly:make-pitch -1 6 0)) + (openloconga default "open" ,(ly:make-pitch -1 6 0)) + (muteloconga default "stopped" ,(ly:make-pitch -1 6 0)) + (hisidestick cross #f ,(ly:make-pitch 0 1 0)) + (hiconga default #f ,(ly:make-pitch 0 1 0)) + (openhiconga default "open" ,(ly:make-pitch 0 1 0)) + (mutehiconga default "stopped" ,(ly:make-pitch 0 1 0)) )) (define-public bongos `( - (losidestick cross #f ,(make-pitch -1 6 0)) - (lobongo default #f ,(make-pitch -1 6 0)) - (openlobongo default "open" ,(make-pitch -1 6 0)) - (mutelobongo default "stopped" ,(make-pitch -1 6 0)) - (hisidestick cross #f ,(make-pitch 0 1 0)) - (hibongo default #f ,(make-pitch 0 1 0)) - (openhibongo default "open" ,(make-pitch 0 1 0)) - (mutehibongo default "stopped" ,(make-pitch 0 1 0)) + (losidestick cross #f ,(ly:make-pitch -1 6 0)) + (lobongo default #f ,(ly:make-pitch -1 6 0)) + (openlobongo default "open" ,(ly:make-pitch -1 6 0)) + (mutelobongo default "stopped" ,(ly:make-pitch -1 6 0)) + (hisidestick cross #f ,(ly:make-pitch 0 1 0)) + (hibongo default #f ,(ly:make-pitch 0 1 0)) + (openhibongo default "open" ,(ly:make-pitch 0 1 0)) + (mutehibongo default "stopped" ,(ly:make-pitch 0 1 0)) )) (define-public percussion `( - (opentriangle cross "open" ,(make-pitch 0 0 0)) - (mutetriangle cross "stopped" ,(make-pitch 0 0 0)) - (triangle cross #f ,(make-pitch 0 0 0)) - (shortguiro default "staccato",(make-pitch 0 0 0)) - (longguiro default "tenuto" ,(make-pitch 0 0 0)) - (guiro default #f ,(make-pitch 0 0 0)) - (cowbell triangle #f ,(make-pitch 0 0 0)) - (claves default #f ,(make-pitch 0 0 0)) - (tambourine default #f ,(make-pitch 0 0 0)) - (cabasa cross #f ,(make-pitch 0 0 0)) - (maracas default #f ,(make-pitch 0 0 0)) - (handclap default #f ,(make-pitch 0 0 0)) + (opentriangle cross "open" ,(ly:make-pitch 0 0 0)) + (mutetriangle cross "stopped" ,(ly:make-pitch 0 0 0)) + (triangle cross #f ,(ly:make-pitch 0 0 0)) + (shortguiro default "staccato",(ly:make-pitch 0 0 0)) + (longguiro default "tenuto" ,(ly:make-pitch 0 0 0)) + (guiro default #f ,(ly:make-pitch 0 0 0)) + (cowbell triangle #f ,(ly:make-pitch 0 0 0)) + (claves default #f ,(ly:make-pitch 0 0 0)) + (tambourine default #f ,(ly:make-pitch 0 0 0)) + (cabasa cross #f ,(ly:make-pitch 0 0 0)) + (maracas default #f ,(ly:make-pitch 0 0 0)) + (handclap default #f ,(ly:make-pitch 0 0 0)) )) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -166,20 +166,20 @@ (define (make-articulation-script x) (let* ((m (make-music-by-name 'ArticulationEvent))) - (ly-set-mus-property! m 'articulation-type x) + (ly:set-mus-property! m 'articulation-type x) m)) ;; adds the articulation script x to m if x is not #f. (define (add-articulation-script m x) (if x - (if (and x (equal? (ly-music-name m) "Request_chord")) - (ly-set-mus-property! m 'elements - (cons (make-articulation-script x) (ly-get-mus-property m 'elements)) + (if (and x (equal? (ly:music-name m) "Request_chord")) + (ly:set-mus-property! m 'elements + (cons (make-articulation-script x) (ly:get-mus-property m 'elements)) ) - (let* ( (es (ly-get-mus-property m 'elements)) - (e (ly-get-mus-property m 'element)) ) + (let* ( (es (ly:get-mus-property m 'elements)) + (e (ly:get-mus-property m 'element)) ) (map (lambda (y) (add-articulation-script y x)) es) - (if (music? e) + (if (ly:music? e) (add-articulation-script e x)) ) ) @@ -209,13 +209,13 @@ ;; makes a sequential-music of thread-context, head-change and note (define (make-drum-head kit req-ch ) - (let ((es (ly-get-mus-property req-ch 'elements))) + (let ((es (ly:get-mus-property req-ch 'elements))) (if (equal? es '()) req-ch (let* ((fe (car es)) - (oldp (ly-get-mus-property fe 'pitch)) + (oldp (ly:get-mus-property fe 'pitch)) ) - (if (not (pitch? oldp)) + (if (not (ly:pitch? oldp)) req-ch (let* ((pap ((pitch->paper kit) oldp )) (style (car pap)) @@ -225,7 +225,7 @@ (seq (make-sequential-music (list ht req-ch))) ) (add-articulation-script req-ch script) - (ly-set-mus-property! fe 'pitch pitch) + (ly:set-mus-property! fe 'pitch pitch) (set! req-ch (make-thread-context style seq)) req-ch ) @@ -241,7 +241,7 @@ (cond ((eq? pitches '()) (begin (display p) ;; UGH. FIXME. pitch->string ??? - (ly-warn " unknown drumpitch.") + (ly:warn " unknown drumpitch.") (cdar (primitive-eval kit)) )) ((eq? p (caddr (car pitches))) ((name->paper kit) (caar pitches)) ) @@ -253,7 +253,7 @@ (let n2p ((pitches (primitive-eval kit))) (cond ((eq? pitches '()) (begin - (ly-warn (string-append "Kit `" (symbol->string kit) "' doesn't contain drum `" n + (ly:warn (string-append "Kit `" (symbol->string kit) "' doesn't contain drum `" n "'\nSee lily/drumpitch.ly for supported drums.")) (cdar (primitive-eval kit)) )) @@ -267,31 +267,31 @@ ;; converts a midi-pitched (ly/drumpitch.ly) file to paper output. (define-public ((drums->paper kit) music) (begin - (if (equal? (ly-music-name music) "Request_chord") + (if (equal? (ly:music-name music) "Request_chord") (set! music (make-drum-head kit music)) - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (p (ly-get-mus-property music 'pitch)) - (body (ly-get-mus-property music 'body)) - (alts (ly-get-mus-property music 'alternatives))) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (p (ly:get-mus-property music 'pitch)) + (body (ly:get-mus-property music 'body)) + (alts (ly:get-mus-property music 'alternatives))) (if (pair? es) - (ly-set-mus-property! music 'elements (map (drums->paper kit) es) ) + (ly:set-mus-property! music 'elements (map (drums->paper kit) es) ) ) - (if (music? alts) - (ly-set-mus-property! + (if (ly:music? alts) + (ly:set-mus-property! music 'alternatives ((drums->paper kit) alts))) - (if (music? body) - (ly-set-mus-property! + (if (ly:music? body) + (ly:set-mus-property! music 'body ((drums->paper kit) body))) - (if (music? e) + (if (ly:music? e) (begin - (ly-set-mus-property! + (ly:set-mus-property! music 'element ((drums->paper kit) e)) ) diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm index ef88bf461a..dd2fd71b81 100644 --- a/scm/engraver-documentation-lib.scm +++ b/scm/engraver-documentation-lib.scm @@ -8,11 +8,11 @@ (define (engraver-makes-grob? name-symbol grav) - (memq name-symbol (assoc 'grobs-created (ly-translator-description grav))) + (memq name-symbol (assoc 'grobs-created (ly:translator-description grav))) ) (define (engraver-accepts-music-type? name-symbol grav) - (memq name-symbol (assoc 'events-accepted (ly-translator-description grav))) + (memq name-symbol (assoc 'events-accepted (ly:translator-description grav))) ) @@ -26,12 +26,12 @@ (define (engraver-doc-string engraver in-which-contexts) (let* ( - (propsr (cdr (assoc 'properties-read (ly-translator-description engraver)))) - (propsw (cdr (assoc 'properties-written (ly-translator-description engraver)))) - (accepted (cdr (assoc 'events-accepted (ly-translator-description engraver)))) - (name (ly-translator-name engraver)) + (propsr (cdr (assoc 'properties-read (ly:translator-description engraver)))) + (propsw (cdr (assoc 'properties-written (ly:translator-description engraver)))) + (accepted (cdr (assoc 'events-accepted (ly:translator-description engraver)))) + (name (ly:translator-name engraver)) (name-sym (string->symbol name)) - (desc (cdr (assoc 'description (ly-translator-description engraver)))) + (desc (cdr (assoc 'description (ly:translator-description engraver)))) (grobs (engraver-grobs engraver)) ) @@ -101,7 +101,7 @@ ;; First level Engraver description (define (engraver-doc grav) (make - #:name (ly-translator-name grav) + #:name (ly:translator-name grav) #:text (engraver-doc-string grav #t) )) @@ -110,8 +110,8 @@ (define name->engraver-table (make-vector 61 '())) (map (lambda (x) - (hash-set! name->engraver-table (ly-translator-name x) x)) - (ly-get-all-translators)) + (hash-set! name->engraver-table (ly:translator-name x) x)) + (ly:get-all-translators)) (define (find-engraver-by-name name) (hash-ref name->engraver-table name #f)) @@ -224,7 +224,7 @@ (if (eq? eg #f) '() - (map symbol->string (cdr (assoc 'grobs-created (ly-translator-description eg)))) + (map symbol->string (cdr (assoc 'grobs-created (ly:translator-description eg)))) ) )) @@ -263,11 +263,11 @@ )) -(define all-engravers-list (ly-get-all-translators)) +(define all-engravers-list (ly:get-all-translators)) (set! all-engravers-list (sort all-engravers-list - (lambda (a b) (string diff --git a/scm/font.scm b/scm/font.scm index 805d26cab9..840515a9c1 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -19,7 +19,7 @@ ((eq? name 'font-shape) 2) ((eq? name 'font-family) 3) ((eq? name 'font-design-size) 4) - (else (ly-warning "unknown font field name")) + (else (ly:warning "unknown font field name")) ) )) diff --git a/scm/function-documentation.scm b/scm/function-documentation.scm index 6a1e7b6f40..459cb08a61 100644 --- a/scm/function-documentation.scm +++ b/scm/function-documentation.scm @@ -20,7 +20,7 @@ (lambda (key val prior) (cons (cons key val) prior) ) - '() (ly-get-all-function-documentation)) + '() (ly:get-all-function-documentation)) ) (define (all-scheme-functions-doc) diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm index 86e2ae1ba6..a33dd48494 100644 --- a/scm/generate-documentation.scm +++ b/scm/generate-documentation.scm @@ -23,7 +23,7 @@ "music-documentation-lib.scm" "backend-documentation-lib.scm" )) -(map ly-load load-files) +(map ly:load load-files) ;;(define no-copies #t) ; from 490 to 410K, but doesn't look nice yet diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 1fb9ace404..0f45647f0b 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -775,7 +775,7 @@ (grace-space-factor . 0.6) (shortest-duration-space . 2.0) (spacing-increment . 1.2) - (base-shortest-duration . ,(make-moment 1 8)) + (base-shortest-duration . ,(ly:make-moment 1 8)) (meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface)))) )) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index a48c1f61f7..ee8029a973 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -12,7 +12,7 @@ (define (grob-property-description symbol type? description) (if (not (equal? (object-property symbol 'backend-doc) #f)) (begin - (ly-warn (string-append "Redefining " (symbol->string symbol) "\n")) + (ly:warn (string-append "Redefining " (symbol->string symbol) "\n")) (exit 2) )) @@ -66,15 +66,15 @@ the grob to the nearest open space. (grob-property-description 'after-line-breaking-callback procedure? "Procedure taking a grob as argument. This procedure is called (using dependency resolution) after line breaking. Return value is ignored.") (grob-property-description 'align number? "the alignment of the text, 0 is horizontal, 1 is vertical.") -(grob-property-description 'align-dir dir? "Which side to align? -1: left side, 0: around center of width, 1: right side.") +(grob-property-description 'align-dir ly:dir? "Which side to align? -1: left side, 0: around center of width, 1: right side.") (grob-property-description 'alignment-done boolean? "boolean to administrate whether we've done the alignment already (to ensure that the process is done only once).") (grob-property-description 'all-elements grob-list? "list of all grobs in this line. Needed for protecting grobs from GC.") (grob-property-description 'arch-angle number? "turning angle of the hook of a system brace" ) (grob-property-description 'arch-height number? "height of the hook of a system brace.") (grob-property-description 'arch-thick number? "thickness of the hook of system brace.") (grob-property-description 'arch-width number? "width of the hook of a system brace.") -(grob-property-description 'arpeggio ly-grob? "pointer to arpeggio object.") -(grob-property-description 'arpeggio-direction dir? "If set, put an +(grob-property-description 'arpeggio ly:grob? "pointer to arpeggio object.") +(grob-property-description 'arpeggio-direction ly:dir? "If set, put an arrow on the arpeggio squiggly line.") (grob-property-description 'attachment pair? "cons of symbols indicating how a slur should be attached at the ends. The format is @@ -92,11 +92,11 @@ In the case of alignment grobs, this should contain only one number.") (grob-property-description 'bar-size number? "size of a bar line.") (grob-property-description 'bars grob-list? "list of barline pointers.") (grob-property-description 'bar-size-procedure procedure? "Procedure that computes the size of a bar line.") -(grob-property-description 'base-shortest-duration moment? +(grob-property-description 'base-shortest-duration ly:moment? "Spacing is based on the shortest notes in a piece. Normally, pieces are spaced as if notes at least as short as this are present.") (grob-property-description 'baseline-skip number? "Baseline skip to use for multiple lines of text.") (grob-property-description 'bass list? " musical-pitch, optional.") -(grob-property-description 'beam ly-grob? "pointer to the beam, if applicable.") +(grob-property-description 'beam ly:grob? "pointer to the beam, if applicable.") (grob-property-description 'beam-thickness number? "thickness, measured in staffspace.") (grob-property-description 'beam-width number? "width of the tremolo sign.") (grob-property-description 'beamed-lengths list? "list of stem lengths given beam multiplicity .") @@ -126,7 +126,7 @@ column as start/begin point. Only columns that have grobs or act as bounds are s (grob-property-description 'cautionary-style symbol? "style of cautionary accidentals. Choices are 'smaller (one size smaller) or 'parentheses.") (grob-property-description 'cautionary boolean? "is this a cautionary accidentals.?") -(grob-property-description 'center-element ly-grob? "grob which will +(grob-property-description 'center-element ly:grob? "grob which will be at the center of the group after aligning (when using Align_interface::center_on_element). .") (grob-property-description 'concaveness-gap number? "A beam is @@ -149,7 +149,7 @@ square of the inner notes involved.") (grob-property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.") (grob-property-description 'de-uglify-parameters list? "list of 3 real constants. They define the valid areas for the middle control points. Used in de_uglyfy. They are a bit empirical.") -(grob-property-description 'neutral-direction dir? "Where to go if we're on the neutral position of the staff (by default, the middle of the staff; see also grob-property neutral-position). [Ross] has the following to say about this: Some engravers consider the middle line neutral, and take the option of using either up- or down-stems for notes that fall on it. However, more up-to-date engraving no longer permits an option; now a down-stem is always appropriate.") +(grob-property-description 'neutral-direction ly:dir? "Where to go if we're on the neutral position of the staff (by default, the middle of the staff; see also grob-property neutral-position). [Ross] has the following to say about this: Some engravers consider the middle line neutral, and take the option of using either up- or down-stems for notes that fall on it. However, more up-to-date engraving no longer permits an option; now a down-stem is always appropriate.") (grob-property-description 'neutral-position number? "Position (in half staff spaces) where to flip the direction of stems: by default, custodes above this position get their stems downwards; custodes below this position get their stems upwards. A value of 0 designates the center of the staff. Use property neutral-direction to control the behaviour of stems on the neutral position itself. (Note: currently, neutral-position is supported only for custodes; for stems of note heads, neutral-position is currently fixed to 0, i.e. the middle of the staff.)") (grob-property-description 'dependencies grob-list? "list of score-grob pointers that indicate who to compute first for certain global passes.") (grob-property-description 'details list? "alist of parameters for detailed grob behavior.") @@ -166,9 +166,9 @@ mean centre distance weighted per note @end table ") -(grob-property-description 'direction dir? "up or down, left or right?.") -(grob-property-description 'direction-source ly-grob? "in case side-relative-direction is set, which grob to get the direction from .") -(grob-property-description 'dot ly-grob? "reference to Dots object.") +(grob-property-description 'direction ly:dir? "up or down, left or right?.") +(grob-property-description 'direction-source ly:grob? "in case side-relative-direction is set, which grob to get the direction from .") +(grob-property-description 'dot ly:grob? "reference to Dots object.") (grob-property-description 'dot-count integer? "number of dots.") (grob-property-description 'duration-log integer? "2-log of the notehead duration, i.e. 0=whole note, 1 = half note, etc.") (grob-property-description 'edge-height pair? "a cons that specifies the heights of the vertical edges '(LEFT-height . RIGHT-height).") @@ -230,7 +230,7 @@ name of character within font.") (grob-property-description 'gap number? "Size of a gap in a variable symbol.") -(grob-property-description 'grow-direction dir? "crescendo or decrescendo?.") +(grob-property-description 'grow-direction ly:dir? "crescendo or decrescendo?.") (grob-property-description 'hair-thickness number? "thickness, measured in stafflinethickness.") (grob-property-description 'heads pair? "Pair of grob pointers, pointing to the two heads of the tie.") (grob-property-description 'height number? "in staffspace.") @@ -277,8 +277,8 @@ For barline, space after a thick line.") (grob-property-description 'left-position number? "position of left part of spanner.") (grob-property-description 'right-position number? "position of right part of spanner.") (grob-property-description 'left-padding number? "space left of accs.") -(grob-property-description 'right-head ly-grob? "") -(grob-property-description 'left-head ly-grob? "") +(grob-property-description 'right-head ly:grob? "") +(grob-property-description 'left-head ly:grob? "") (grob-property-description 'left-widen boolean? "Whether the left edge of a piano pedal bracket should be widened by the first element of edge-widen.") @@ -297,7 +297,7 @@ and will have no effect. (grob-property-description 'magnify number? "the magnification factor. FIXME: doesn't work for feta fonts.") (grob-property-description 'maximum-length number? "don't make Grob longer than this") (grob-property-description 'maximum-rest-count integer? "kill off rests so we don't more than this number left.") -(grob-property-description 'measure-length moment? "Length of a +(grob-property-description 'measure-length ly:moment? "Length of a measure. Used in some spacing situations.") (grob-property-description 'measure-count integer? "number of measures for a multimeasure rest.") @@ -345,7 +345,7 @@ written in C++, but you can also write them in Scheme. An example is provided in @code{input/regression/molecule-hacking.ly}. ") -(grob-property-description 'molecule molecule? "Cached output of the molecule-callback.") +(grob-property-description 'molecule ly:molecule? "Cached output of the molecule-callback.") (grob-property-description 'new-accidentals list? "list of (pitch, accidental) pairs.") (grob-property-description 'no-spacing-rods boolean? "read from grobs: boolean that makes Separation_item ignore this item (MOVE ME TO ITEM).") @@ -358,14 +358,14 @@ provided in @code{input/regression/molecule-hacking.ly}. (grob-property-description 'outer boolean? "whether a text spanner should extend to the outer edge of the spanned notes") (grob-property-description 'padding number? "add this much extra space between objects that are next to each other.") (grob-property-description 'pedal-type symbol? "Style of piano pedal: text, bracket or mixed.") -(grob-property-description 'pedal-text ly-grob? "Pointer to the text of a mixed-style piano pedal.") +(grob-property-description 'pedal-text ly:grob? "Pointer to the text of a mixed-style piano pedal.") (grob-property-description 'penalty number? "Penalty for breaking at this column. 10000 or more means forbid linebreak, -10000 or less means force linebreak. Other values influence linebreaking decisions as a real penalty.") -(grob-property-description 'pitch-max pitch? "FIXME, JUNKME") -(grob-property-description 'pitch-min pitch? "FIXME, JUNKME") +(grob-property-description 'pitch-max ly:pitch? "FIXME, JUNKME") +(grob-property-description 'pitch-min ly:pitch? "FIXME, JUNKME") (grob-property-description 'pitches list? "list of musical-pitch.") @@ -387,15 +387,15 @@ TODO: revise typing.") (grob-property-description 'self-alignment-Y number? "like self-alignment-X but for Y axis.") (grob-property-description 'shorten number? "the amount of space that a stem should be shortened (DOCME!)") (grob-property-description 'shorten-pair number-pair? "the length on each side to shorten a text-spanner, for example a pedal bracket") -(grob-property-description 'common-shortest-duration moment? +(grob-property-description 'common-shortest-duration ly:moment? "The most common shortest note length. This is used in spacing. Making this larger will make the score tighter.") (grob-property-description 'shortest-duration-space number? "Start with this much space for the shortest duration. This is explessed in @code{spacing-increment} as unit. See also @ref{spacing-spanner-interface}.") -(grob-property-description 'shortest-playing-duration moment? "duration of the shortest playing in that column.") -(grob-property-description 'shortest-starter-duration moment? "duration of the shortest notes that starts exactly in this column.") -(grob-property-description 'side-relative-direction dir? "if set: get the direction from a different object, and multiply by this.") +(grob-property-description 'shortest-playing-duration ly:moment? "duration of the shortest playing in that column.") +(grob-property-description 'shortest-starter-duration ly:moment? "duration of the shortest notes that starts exactly in this column.") +(grob-property-description 'side-relative-direction ly:dir? "if set: get the direction from a different object, and multiply by this.") (grob-property-description 'side-support-elements grob-list? "the support, a list of grobs.") (grob-property-description 'slope number? "some kind of slope") (grob-property-description 'slope-limit number? "set slope to zero if slope is running away steeper than this.") @@ -412,12 +412,12 @@ minimum-space or extra-space.") taking grob as argument. This is called after before-line-breaking-callback, but before the actual line breaking itself. Return value is ignored.") -(grob-property-description 'stacking-dir dir? "stack contents of grobs in which direction ?.") +(grob-property-description 'stacking-dir ly:dir? "stack contents of grobs in which direction ?.") (grob-property-description 'staff-space number? "Amount of line leading relative to global staffspace.") (grob-property-description 'staff-position number? "vertical position in staff spaces, counted from the middle line.") (grob-property-description 'staffline-clearance number? "don't get closer than this to stafflines.") -(grob-property-description 'stem ly-grob? "pointer to Stem object.") +(grob-property-description 'stem ly:grob? "pointer to Stem object.") (grob-property-description 'stem-attachment-function procedure? "Where does the stem attach to the notehead? Function takes a symbol argument being the style. It returns a (X . Y) pair, specifying location in @@ -430,7 +430,7 @@ the Nth element of the list gives the amount stem shortening of a note with N fl (grob-property-description 'stem-spacing-correction number? "optical correction amount. [TODO: doco] ") (grob-property-description 'stems grob-list? "list of stem objects, corresponding to the notes that the arpeggio has to be before.") (grob-property-description 'style symbol? "a string determining what style of glyph is typeset. Valid choices depend on the function that is reading this property. .") -(grob-property-description 'support-head ly-grob? "the note head at +(grob-property-description 'support-head ly:grob? "the note head at one end of the stem.") (grob-property-description 'text markup? " Scheme markup text. It is defined as follows: @@ -507,7 +507,7 @@ bracket. Setting the property to #'if-no-beam will make it print only if there is no beam associated with this tuplet bracket.") (grob-property-description 'number-visibility boolean-or-symbol? " Like @code{bracket-visibility}, but for the number.") -(grob-property-description 'tie ly-grob? "") +(grob-property-description 'tie ly:grob? "") (grob-property-description 'type symbol? " one of: line, dashed-line, trill or dotted-line. @@ -533,7 +533,7 @@ of booleans, signifying whether this grob should be transparent and have no extent. ") -(grob-property-description 'when moment? "when does this column happen?.") +(grob-property-description 'when ly:moment? "when does this column happen?.") (grob-property-description 'word-space number? "elongate left by this much (FIXME: cumbersome semantics).") (grob-property-description 'alignment number? "alignment of lyrics on notehead, -1 is LEFT, 0 is CENTRE, 1 is RIGHT .") (grob-property-description 'ignore-length-mismatch boolean? "if #t, stanzas with shorter lyrics can be moved away from their respective note-head by the lyric alignment code.") @@ -559,17 +559,17 @@ columns. (grob-property-description 'right-items grob-list? "") (grob-property-description 'cause scheme? "Any kind of causation objects (i.e. music, or perhaps translator) that was the cause for this grob. ") -(grob-property-description 'font font-metric? "Cached font metric object") +(grob-property-description 'font ly:font-metric? "Cached font metric object") (grob-property-description 'break-alignment-done boolean? "mark flag to signal we've done alignment already.") -(grob-property-description 'staff-symbol ly-grob? "the staff symbol grob that we're in.") +(grob-property-description 'staff-symbol ly:grob? "the staff symbol grob that we're in.") (grob-property-description 'collision-done boolean? "") -(grob-property-description 'rest ly-grob? "the staff symbol grob that we're in.") -(grob-property-description 'rest-collision ly-grob? "rest collision that a rest is in.") +(grob-property-description 'rest ly:grob? "the staff symbol grob that we're in.") +(grob-property-description 'rest-collision ly:grob? "rest collision that a rest is in.") (grob-property-description 'staff-support boolean? " JUNKME.") (grob-property-description 'script-molecule pair? "index code for script.") -(grob-property-description 'accidental-grob ly-grob? "Accidental for this note.") +(grob-property-description 'accidental-grob ly:grob? "Accidental for this note.") (grob-property-description 'causes list? "list of cause objects; these can be music objects or grobs.") (grob-property-description 'flag-count number? "") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index a062399d73..e87ae0c5ef 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -8,37 +8,37 @@ ; should include default value? -(ly-add-interface +(ly:add-interface 'note-name-interface "Note name" '(style)) -(ly-add-interface +(ly:add-interface 'dynamic-interface "Any kind of loudness sign" '() ) -(ly-add-interface +(ly:add-interface 'finger-interface "A fingering instruction" '() ) -(ly-add-interface +(ly:add-interface 'ligature-interface "A ligature" '() ) -(ly-add-interface +(ly:add-interface 'mark-interface "a rehearsal mark" '( )) ;;; todo: this is not typesetting info. Move to interpretation. -(ly-add-interface +(ly:add-interface 'tablature-interface "tablature notes" '()) diff --git a/scm/lily.scm b/scm/lily.scm index 470c30dea6..86243a87cf 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -7,9 +7,8 @@ ;;; Library functions -(use-modules (ice-9 regex)) -;;(write standalone (current-error-port)) +(use-modules (ice-9 regex)) ;;; General settings @@ -56,9 +55,6 @@ (define-public default-script-alist '()) (define-public security-paranoia #f) -(if (not (defined? 'standalone)) - (define-public standalone (not (defined? 'ly-gulp-file)))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Unassorted utility functions. @@ -166,9 +162,12 @@ is the first to satisfy CRIT (string-append str (make-string (max (- wid (string-length str)) 0) #\ )) ) -(define-public (ly-load x) - (let* ((fn (%search-load-path x))) - (if (ly-verbose) +(define-public (ly:load x) + (let* ( + (fn (%search-load-path x)) + + ) + (if (ly:verbose) (format (current-error-port) "[~A]" fn)) (primitive-load fn))) @@ -213,30 +212,29 @@ is the first to satisfy CRIT ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; other files. -(if (not standalone) - (map ly-load +(map ly:load ; load-from-path - '("music-types.scm" - "output-lib.scm" - "c++.scm" - "molecule.scm" - "bass-figure.scm" - "grob-property-description.scm" - "context-description.scm" - "interface-description.scm" - "beam.scm" - "clef.scm" - "slur.scm" - "font.scm" - "music-functions.scm" - "music-property-description.scm" - "auto-beam.scm" - "basic-properties.scm" - "chord-name.scm" - "grob-description.scm" - "translator-property-description.scm" - "script.scm" - "drums.scm" - "midi.scm" - ))) + '("music-types.scm" + "output-lib.scm" + "c++.scm" + "molecule.scm" + "bass-figure.scm" + "grob-property-description.scm" + "context-description.scm" + "interface-description.scm" + "beam.scm" + "clef.scm" + "slur.scm" + "font.scm" + "music-functions.scm" + "music-property-description.scm" + "auto-beam.scm" + "basic-properties.scm" + "chord-name.scm" + "grob-description.scm" + "translator-property-description.scm" + "script.scm" + "drums.scm" + "midi.scm" + )) diff --git a/scm/midi.scm b/scm/midi.scm index bf5f129808..79ffe5846a 100644 --- a/scm/midi.scm +++ b/scm/midi.scm @@ -289,6 +289,6 @@ Note: MIDI cannot handle other tonalities than major/minor. ;; This charactersition is only true for a scale that starts at `c'. (if (not (equal? (car pitch-list) '(0 . 0))) (begin - (ly-warn "Attempt to determine tonality of transposed scale") + (ly:warn "Attempt to determine tonality of transposed scale") #t) (eq? (cdr (list-ref pitch-list 4)) (cdr (list-ref pitch-list 6))))) diff --git a/scm/molecule.scm b/scm/molecule.scm index da52f15c30..1335e9af5a 100644 --- a/scm/molecule.scm +++ b/scm/molecule.scm @@ -4,7 +4,7 @@ (if (null? mols) '() (if (pair? mols) - (ly-combine-molecule-at-edge (car mols) axis dir + (ly:combine-molecule-at-edge (car mols) axis dir (stack-molecules axis dir padding (cdr mols)) padding ) @@ -16,21 +16,21 @@ (define-public (fontify-text font-metric text) "Set TEXT with font FONT-METRIC, returning a molecule." - (let* ((b (ly-text-dimension font-metric text))) - (ly-make-molecule - (ly-fontify-atom font-metric `(text ,text)) (car b) (cdr b)) + (let* ((b (ly:text-dimension font-metric text))) + (ly:make-molecule + (ly:fontify-atom font-metric `(text ,text)) (car b) (cdr b)) )) (define-public (bracketify-molecule mol axis thick protusion padding) "Add brackets around MOL, producing a new molecule." (let* ( - (ext (ly-get-molecule-extent mol axis)) - (lb (ly-bracket axis ext thick (- protusion))) - (rb (ly-bracket axis ext thick protusion)) + (ext (ly:get-molecule-extent mol axis)) + (lb (ly:bracket axis ext thick (- protusion))) + (rb (ly:bracket axis ext thick protusion)) ) - (set! mol (ly-combine-molecule-at-edge mol (other-axis axis) 1 lb padding)) - (set! mol (ly-combine-molecule-at-edge mol (other-axis axis) -1 rb padding)) + (set! mol (ly:combine-molecule-at-edge mol (other-axis axis) 1 lb padding)) + (set! mol (ly:combine-molecule-at-edge mol (other-axis axis) -1 rb padding)) mol )) @@ -39,7 +39,7 @@ (define-public (box-molecule xext yext) "Make a filled box." - (ly-make-molecule + (ly:make-molecule (list 'filledbox (- (car xext)) (cdr xext) (- (car yext)) (cdr yext)) xext yext) @@ -49,15 +49,15 @@ "Make a box of exactly the extents of the grob. The box precisely encloses the contents. " - (let* ((xext (ly-get-extent grob grob 0)) - (yext (ly-get-extent grob grob 1)) - (mol (ly-make-molecule '() '(10000 . -10000) '(10000 . -10000))) + (let* ((xext (ly:get-extent grob grob 0)) + (yext (ly:get-extent grob grob 1)) + (mol (ly:make-molecule '() '(10000 . -10000) '(10000 . -10000))) (thick 0.1) ) - (set! mol (ly-add-molecule mol (box-molecule xext (cons (- (car yext) thick) (car yext) )))) - (set! mol (ly-add-molecule mol (box-molecule xext (cons (cdr yext) (+ (cdr yext) thick) )))) - (set! mol (ly-add-molecule mol (box-molecule (cons (cdr xext) (+ (cdr xext) thick)) yext))) - (set! mol (ly-add-molecule mol (box-molecule (cons (- (car xext) thick) (car xext)) yext))) + (set! mol (ly:add-molecule mol (box-molecule xext (cons (- (car yext) thick) (car yext) )))) + (set! mol (ly:add-molecule mol (box-molecule xext (cons (cdr yext) (+ (cdr yext) thick) )))) + (set! mol (ly:add-molecule mol (box-molecule (cons (cdr xext) (+ (cdr xext) thick)) yext))) + (set! mol (ly:add-molecule mol (box-molecule (cons (- (car xext) thick) (car xext)) yext))) mol )) diff --git a/scm/music-documentation-lib.scm b/scm/music-documentation-lib.scm index af39ea7641..bd6a8ea7ef 100644 --- a/scm/music-documentation-lib.scm +++ b/scm/music-documentation-lib.scm @@ -57,7 +57,7 @@ "\n\nAccepted by: " (human-listify (map ref-ify - (map ly-translator-name + (map ly:translator-name (filter-list (lambda (x) (engraver-accepts-music-type? (car entry) x)) all-engravers-list)))) "\n\n" @@ -88,7 +88,7 @@ "\n\nAccepted by: " (human-listify (map ref-ify - (map ly-translator-name + (map ly:translator-name (filter-list (lambda (x) (engraver-accepts-music-types? types x)) all-engravers-list)))) "\n\nProperties: \n" diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 8fc904aebc..f078e40da4 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -2,47 +2,49 @@ ;; tuplets. (define-public (denominator-tuplet-formatter mus) - (number->string (ly-get-mus-property mus 'denominator))) + (number->string (ly:get-mus-property mus 'denominator))) (define-public (fraction-tuplet-formatter mus) - (string-append (number->string (ly-get-mus-property mus 'numerator)) + (string-append (number->string (ly:get-mus-property mus 'numerator)) ":" - (number->string (ly-get-mus-property mus 'denominator)) + (number->string (ly:get-mus-property mus 'denominator)) )) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define-public (shift-duration-log music shift dot) - "Recurse through music, adding SHIFT to duration-log and optionally + "Recurse through music, adding SHIFT to ly:duration-log and optionally a dot to any note encountered. This scales the music up by a factor 2^shift * (2 - (1/2)^dot)" - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (n (ly-music-name music)) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (n (ly:music-name music)) (f (lambda (x) (shift-duration-log x shift dot))) ) + + ;; FIXME: broken by the great music rename. (if (or (equal? n "Note_req") (equal? n "Rest_req")) (let* ( - (d (ly-get-mus-property music 'duration)) - (cp (duration-factor d)) - (nd (make-duration (+ shift (duration-log d)) + (d (ly:get-mus-property music 'duration)) + (cp (ly:duration-factor d)) + (nd (ly:make-duration (+ shift (ly:duration-log d)) (+ dot (duration-dot-count d)) (car cp) (cdr cp))) ) - (ly-set-mus-property! music 'duration nd) + (ly:set-mus-property! music 'duration nd) )) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map f es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (f e))) @@ -56,31 +58,31 @@ " This function replaces all repeats with unfold repeats. It was written by Rune Zedeler. " - (let* ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (n (ly-music-name music))) + (let* ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (n (ly:music-name music))) (if (equal? n "Repeated_music") (begin (if (equal? - (ly-get-mus-property music 'iterator-ctor) + (ly:get-mus-property music 'iterator-ctor) Chord_tremolo_iterator::constructor) - (shift-duration-log music (intlog2 (ly-get-mus-property music 'repeat-count)) 0) + (shift-ly:duration-log music (ly:intlog2 (ly:get-mus-property music 'repeat-count)) 0) ) - (ly-set-mus-property! + (ly:set-mus-property! music 'length Repeated_music::unfolded_music_length) - (ly-set-mus-property! + (ly:set-mus-property! music 'start-moment-function Repeated_music::first_start) - (ly-set-mus-property! + (ly:set-mus-property! music 'iterator-ctor Unfolded_repeat_iterator::constructor))) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map unfold-repeats es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (unfold-repeats e))) @@ -94,29 +96,29 @@ written by Rune Zedeler. " "Copy the pitch fields of the Note_requests into Text_script_requests, to aid Fingering_engraver." (define (find-note musics) - (filter-list (lambda (m) (equal? (ly-music-name m) "Note_req")) musics) + (filter-list (lambda (m) (equal? (ly:music-name m) "Note_req")) musics) ) (define (find-scripts musics) - (filter-list (lambda (m) (equal? (ly-music-name m) "Text_script_req")) musics)) + (filter-list (lambda (m) (equal? (ly:music-name m) "Text_script_req")) musics)) (let* ( - (e (ly-get-mus-property music 'element)) - (es (ly-get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (es (ly:get-mus-property music 'elements)) (notes (find-note es)) - (pitch (if (pair? notes) (ly-get-mus-property (car notes) 'pitch) #f)) + (pitch (if (pair? notes) (ly:get-mus-property (car notes) 'pitch) #f)) ) (if pitch - (map (lambda (x) (ly-set-mus-property! x 'pitch pitch)) (find-scripts es)) + (map (lambda (x) (ly:set-mus-property! x 'pitch pitch)) (find-scripts es)) ) (if (pair? es) - (ly-set-mus-property! + (ly:set-mus-property! music 'elements (map pitchify-scripts es))) - (if (music? e) - (ly-set-mus-property! + (if (ly:music? e) + (ly:set-mus-property! music 'element (pitchify-scripts e))) @@ -131,10 +133,10 @@ this is not an override " (let* ((m (make-music-by-name 'OverrideProperty))) - (ly-set-mus-property! m 'symbol grob) - (ly-set-mus-property! m 'grob-property gprop) - (ly-set-mus-property! m 'grob-value val) - (ly-set-mus-property! m 'pop-first #t) + (ly:set-mus-property! m 'symbol grob) + (ly:set-mus-property! m 'grob-property gprop) + (ly:set-mus-property! m 'grob-value val) + (ly:set-mus-property! m 'pop-first #t) m @@ -144,8 +146,8 @@ this is not an override (define-public (make-grob-property-revert grob gprop) "Revert the grob property GPROP for GROB." (let* ((m (make-music-by-name 'OverrideProperty))) - (ly-set-mus-property! m 'symbol grob) - (ly-set-mus-property! m 'grob-property gprop) + (ly:set-mus-property! m 'symbol grob) + (ly:set-mus-property! m 'grob-property gprop) m @@ -182,29 +184,29 @@ this is not an override "Add \context CONTEXT = foo to M. " (let* ((cm (make-music-by-name 'ContextSpeccedMusic))) - (ly-set-mus-property! cm 'element m) - (ly-set-mus-property! cm 'context-type context) + (ly:set-mus-property! cm 'element m) + (ly:set-mus-property! cm 'context-type context) (if (and (pair? rest) (string? (car rest))) - (ly-set-mus-property! cm 'context-id (car rest)) + (ly:set-mus-property! cm 'context-id (car rest)) ) cm )) (define-public (make-sequential-music elts) (let* ((m (make-music-by-name 'SequentialMusic))) - (ly-set-mus-property! m 'elements elts) + (ly:set-mus-property! m 'elements elts) m )) (define-public (make-simultaneous-music elts) (let* ((m (make-music-by-name 'SimultaneousMusic))) - (ly-set-mus-property! m 'elements elts) + (ly:set-mus-property! m 'elements elts) m )) (define-public (make-event-chord elts) (let* ((m (make-music-by-name 'EventChord))) - (ly-set-mus-property! m 'elements elts) + (ly:set-mus-property! m 'elements elts) m )) @@ -219,10 +221,10 @@ this is not an override (ch2 (make-music-by-name 'BarCheck)) ) - (ly-set-mus-property! start 'span-direction START) - (ly-set-mus-property! stop 'span-direction STOP) - (ly-set-mus-property! skip 'duration duration) - (map (lambda (x) (ly-set-mus-property! x 'origin location)) + (ly:set-mus-property! start 'span-direction START) + (ly:set-mus-property! stop 'span-direction STOP) + (ly:set-mus-property! skip 'duration duration) + (map (lambda (x) (ly:set-mus-property! x 'origin location)) (list start stop skip ch ch2)) (make-sequential-music (list @@ -237,14 +239,14 @@ this is not an override (define-public (make-penalty-music pen) (let ((m (make-music-by-name 'BreakEvent))) - (ly-set-mus-property! m 'penalty pen) - m)) + (ly:set-mus-property! m 'penalty pen) + m)) (define-public (make-articulation name) (let* ( (m (make-music-by-name 'ArticulationEvent)) ) - (ly-set-mus-property! m 'articulation-type name) + (ly:set-mus-property! m 'articulation-type name) m )) @@ -253,13 +255,13 @@ this is not an override "Set all of ALIST as properties of M." (if (pair? alist) (begin - (ly-set-mus-property! m (caar alist) (cdar alist)) + (ly:set-mus-property! m (caar alist) (cdar alist)) (set-mus-properties! m (cdr alist))) )) (define-public (music-separator? m) "Is M a separator?" - (let* ((ts (ly-get-mus-property m 'types ))) + (let* ((ts (ly:get-mus-property m 'types ))) (memq 'separator ts) )) @@ -314,10 +316,10 @@ this is not an override (define (voicify-chord ch) "Split the parts of a chord into different Voices using separator" - (let* ((es (ly-get-mus-property ch 'elements))) + (let* ((es (ly:get-mus-property ch 'elements))) - (ly-set-mus-property! ch 'elements + (ly:set-mus-property! ch 'elements (voicify-list (split-list es music-separator?) 0)) ch )) @@ -325,20 +327,20 @@ this is not an override (define (voicify-music m) "Recursively split chords that are separated with \\ " - (if (not (music? m)) + (if (not (ly:music? m)) (begin (display m) (error "not music!")) ) (let* - ((es (ly-get-mus-property m 'elements)) - (e (ly-get-mus-property m 'element)) + ((es (ly:get-mus-property m 'elements)) + (e (ly:get-mus-property m 'element)) ) (if (pair? es) - (ly-set-mus-property! m 'elements (map voicify-music es))) - (if (music? e) - (ly-set-mus-property! m 'element (voicify-music e))) + (ly:set-mus-property! m 'elements (map voicify-music es))) + (if (ly:music? e) + (ly:set-mus-property! m 'element (voicify-music e))) (if - (and (equal? (ly-music-name m) "Simultaneous_music") + (and (equal? (ly:music-name m) "Simultaneous_music") (reduce (lambda (x y ) (or x y)) (map music-separator? es))) (voicify-chord m) ) @@ -347,7 +349,7 @@ this is not an override )) (define-public (empty-music) - (ly-id (make-music-by-name 'Music)) + (ly:id (make-music-by-name 'Music)) ) ;;; @@ -355,35 +357,35 @@ this is not an override (define-public (make-type-checker symbol) (lambda (elt) ;;(display symbol) - ;;(eq? #t (ly-get-grob-property elt symbol)) - (not (eq? #f (memq symbol (ly-get-grob-property elt 'interfaces)))))) + ;;(eq? #t (ly:get-grob-property elt symbol)) + (not (eq? #f (memq symbol (ly:get-grob-property elt 'interfaces)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; warn for bare chords at start. (define (has-request-chord elts) - (reduce (lambda (x y) (or x y)) (map (lambda (x) (equal? (ly-music-name x) + (reduce (lambda (x y) (or x y)) (map (lambda (x) (equal? (ly:music-name x) "Request_chord")) elts) )) -(define (ly-music-message music msg) +(define (ly:music-message music msg) (let* ( - (ip (ly-get-mus-property music 'origin)) + (ip (ly:get-mus-property music 'origin)) ) - (if (ly-input-location? ip) - (ly-input-message ip msg) - (ly-warn msg)) + (if (ly:input-location? ip) + (ly:input-message ip msg) + (ly:warn msg)) )) (define (check-start-chords music) "Check music expression for a Simultaneous_music containing notes\n(ie. Request_chords), without context specification. Called from parser." (let* - ((es (ly-get-mus-property music 'elements)) - (e (ly-get-mus-property music 'element)) - (name (ly-music-name music)) + ((es (ly:get-mus-property music 'elements)) + (e (ly:get-mus-property music 'element)) + (name (ly:music-name music)) ) (cond @@ -391,13 +393,13 @@ this is not an override ((equal? name "Simultaneous_music") (if (has-request-chord es) - (ly-music-message music "Starting score with a chord.\nPlease insert an explicit \\context before chord") + (ly:music-message music "Starting score with a chord.\nPlease insert an explicit \\context before chord") (map check-start-chords es))) ((equal? name "Sequential_music") (if (pair? es) (check-start-chords (car es)))) - (else (if (music? e) (check-start-chords e ))) + (else (if (ly:music? e) (check-start-chords e ))) )) music diff --git a/scm/music-property-description.scm b/scm/music-property-description.scm index 8719a9751d..03b043d14b 100644 --- a/scm/music-property-description.scm +++ b/scm/music-property-description.scm @@ -11,7 +11,7 @@ (define (music-property-description symbol type? description) (if (not (equal? #f (object-property symbol 'music-doc))) (begin - (ly-warn (string-append "Redefining " (symbol->string symbol) "\n")) + (ly:warn (string-append "Redefining " (symbol->string symbol) "\n")) (exit 2) )) (set-object-property! symbol 'music-type? type?) @@ -22,7 +22,7 @@ (music-property-description 'iterator-ctor procedure? "Function to construct music-event-iterator object for this Music") -(music-property-description 'duration duration? "Duration of this note/lyric.") +(music-property-description 'duration ly:duration? "Duration of this note/lyric.") (music-property-description 'metronome-count number? "How many beats in a minute?") (music-property-description 'span-type string? "What kind of spanner should be created? @@ -38,24 +38,24 @@ TODO: consider making type into symbol ") (music-property-description 'context-id string? "name of context") (music-property-description 'context-type string? "type of context") (music-property-description 'denominator integer? "denominator in a time signature") -(music-property-description 'direction dir? "Print this up or down?") +(music-property-description 'direction ly:dir? "Print this up or down?") (music-property-description 'text-type symbol? "Particular type of text script (eg. finger, dynamic).") -(music-property-description 'element music? "The single child of a Music_wrapper music object, or the body of a repeat.") +(music-property-description 'element ly:music? "The single child of a Music_wrapper music object, or the body of a repeat.") (music-property-description 'elements music-list? "A list of elements for sequential of simultaneous music, or the alternatives of repeated music. ") (music-property-description 'force-accidental boolean? "If set, a cautionary accidental should always be printed on this note") (music-property-description 'grob-property symbol? "The symbol of the grob property to set. ") (music-property-description 'grob-value scheme? "The value of the grob property to set") (music-property-description 'inversion boolean? "If set, this chord note is inverted.") (music-property-description 'label markup? "label of a mark.") -(music-property-description 'last-pitch pitch? "The last pitch after relativization.") +(music-property-description 'last-pitch ly:pitch? "The last pitch after relativization.") (music-property-description 'length procedure? "How to compute the duration of this music") (music-property-description 'internal-class-name string? "C++ class to use for this Music object") (music-property-description 'name symbol? "Name of this music object") (music-property-description 'numerator integer? "numerator of a time signature") (music-property-description 'once boolean? "Apply this operation only during one time step?") -(music-property-description 'origin ly-input-location? "where was this piece of music defined?") +(music-property-description 'origin ly:input-location? "where was this piece of music defined?") (music-property-description 'penalty number? "Penalty for break hint.") -(music-property-description 'pitch pitch? "the pitch of this note") +(music-property-description 'pitch ly:pitch? "the pitch of this note") (music-property-description 'pitch-alist list? "list of pitches jointly forming the scale of a key signature") (music-property-description 'pop-first boolean? "Do a revert before we try to do a override on some grob property.") @@ -63,7 +63,7 @@ TODO: consider making type into symbol ") (music-property-description 'type symbol? "The type of this music object. Determines iteration in some cases.") (music-property-description 'types list? "The types of this music object. Determines iteration in some cases.") (music-property-description 'repeat-count integer? "do a @code{\repeat} how ofen?") -(music-property-description 'span-direction dir? "Does this start or stop a spanner?") +(music-property-description 'span-direction ly:dir? "Does this start or stop a spanner?") (music-property-description 'start-moment-function procedure? "Function to compute the negative length of starting grace notes.") diff --git a/scm/music-types.scm b/scm/music-types.scm index b56fb33069..284dfc64e7 100644 --- a/scm/music-types.scm +++ b/scm/music-types.scm @@ -553,8 +553,8 @@ ) (if (eq? props '()) - (ly-warn (format "Could not find music type `~a'" x))) - (ly-make-bare-music name props) + (ly:warn (format "Could not find music type `~a'" x))) + (ly:make-bare-music name props) )) @@ -574,7 +574,7 @@ (if (pair? handle) (cdr handle) (begin - (ly-warn + (ly:warn (string-append "Unknown repeat type `" name "'\nSee music-types.scm for supported repeats")) 'VoltaRepeatedMusic) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 5fc63529a0..b0ad0fccff 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -16,8 +16,8 @@ ; Create a text molecule (define-public (tablature-molecule-callback grob) (let ((molecule (fontify-text - (ly-get-default-font grob) - (ly-get-grob-property grob 'text) + (ly:get-default-font grob) + (ly:get-grob-property grob 'text) ))) molecule ; return the molecule. ) @@ -27,7 +27,7 @@ ; Compute the text grob-property (define-public (fret-number-tablature-format string tuning pitch) (number->string - (- (pitch-semitones pitch) + (- (ly:pitch-semitones pitch) (list-ref tuning (- string 1) ; remove 1 because list index starts at 0 and guitar string at 1. ) @@ -36,30 +36,30 @@ ) (define-public (hammer-molecule-callback grob) - (let* ((note-collums (ly-get-grob-property grob 'note-columns)) + (let* ((note-collums (ly:get-grob-property grob 'note-columns)) (note-column1 (cadr note-collums)) (note-column2 (car note-collums)) - (note1 (car (ly-get-grob-property note-column1 'note-heads))) - (note2 (car (ly-get-grob-property note-column2 'note-heads))) - (fret1 (string->number (ly-get-grob-property note1 'text))) - (fret2 (string->number (ly-get-grob-property note2 'text))) + (note1 (car (ly:get-grob-property note-column1 'note-heads))) + (note2 (car (ly:get-grob-property note-column2 'note-heads))) + (fret1 (string->number (ly:get-grob-property note1 'text))) + (fret2 (string->number (ly:get-grob-property note2 'text))) (letter (if (< fret1 fret2) "H" (if (> fret1 fret2) "P" ""))) ) (let ((slur (Slur::brew_molecule grob)) - (text (fontify-text (ly-get-default-font grob) letter))) + (text (fontify-text (ly:get-default-font grob) letter))) - (let ((x (/ (- (cdr (ly-get-molecule-extent slur 0)) - (/ (cdr (ly-get-molecule-extent text 0)) 2.0) + (let ((x (/ (- (cdr (ly:get-molecule-extent slur 0)) + (/ (cdr (ly:get-molecule-extent text 0)) 2.0) ) -2.0))) - (ly-set-molecule-extent! text 0 (cons x x)) - (ly-align-to! text 0 1) + (ly:set-molecule-extent! text 0 (cons x x)) + (ly:align-to! text 0 1) ) - (ly-combine-molecule-at-edge slur 1 1 text -0.6) + (ly:combine-molecule-at-edge slur 1 1 text -0.6) ) ) ) @@ -77,17 +77,17 @@ (let* ( (mol (callback grob)) - (x-ext (widen-interval (ly-get-molecule-extent mol 0) x-padding)) - (y-ext (widen-interval (ly-get-molecule-extent mol 1) y-padding)) + (x-ext (widen-interval (ly:get-molecule-extent mol 0) x-padding)) + (y-ext (widen-interval (ly:get-molecule-extent mol 1) y-padding)) (x-rule (box-molecule (widen-interval x-ext line-thick) (cons 0 line-thick))) (y-rule (box-molecule (cons 0 line-thick) y-ext)) ) - (set! mol (ly-combine-molecule-at-edge mol 0 1 y-rule x-padding)) - (set! mol (ly-combine-molecule-at-edge mol 0 -1 y-rule x-padding)) - (set! mol (ly-combine-molecule-at-edge mol 1 1 x-rule 0)) - (set! mol (ly-combine-molecule-at-edge mol 1 -1 x-rule 0)) + (set! mol (ly:combine-molecule-at-edge mol 0 1 y-rule x-padding)) + (set! mol (ly:combine-molecule-at-edge mol 0 -1 y-rule x-padding)) + (set! mol (ly:combine-molecule-at-edge mol 1 1 x-rule 0)) + (set! mol (ly:combine-molecule-at-edge mol 1 -1 x-rule 0)) mol )) @@ -101,7 +101,7 @@ (define (comment s) "") (define-public (numbers->string l) - (apply string-append (map ly-number->string l))) + (apply string-append (map ly:number->string l))) ; (define (chop-decimal x) (if (< (abs x) 0.001) 0.0 x)) @@ -250,7 +250,7 @@ centered, X==1 is at the right, X == -1 is at the left." ))) (if (equal? result #f) - (ly-warn (string-append "Unknown bar glyph: `" glyph "'")) + (ly:warn (string-append "Unknown bar glyph: `" glyph "'")) (index-cell (cdr result) dir)) ) ) diff --git a/scm/pdf.scm b/scm/pdf.scm index b2adf3bea1..900854ed43 100644 --- a/scm/pdf.scm +++ b/scm/pdf.scm @@ -41,15 +41,15 @@ (lineto (+ x (car currentpoint)) (+ y (cdr currentpoint)))) (define (curveto x1 y1 x2 y2 x y) (set! currentpoint (cons x y)) - (string-append (ly-number->string x1) (ly-number->string y1) - (ly-number->string x2) (ly-number->string y2) - (ly-number->string x) (ly-number->string y) "c ")) + (string-append (ly:number->string x1) (ly:number->string y1) + (ly:number->string x2) (ly:number->string y2) + (ly:number->string x) (ly:number->string y) "c ")) (define (curveto-pairs pt1 pt2 pt) (curveto (car pt1) (cdr pt1) (car pt2) (cdr pt2) (car pt) (cdr pt))) (define (closefill) "h f ") (define (closestroke) "S ") -(define (setlinewidth w) (string-append (ly-number->string w) "w ")) -(define (setgray g) (string-append (ly-number->string g) "g ")) +(define (setlinewidth w) (string-append (ly:number->string w) "w ")) +(define (setgray g) (string-append (ly:number->string g) "g ")) (define (setlineparams) "1 j 1 J ") (define (beam width slope thick) @@ -106,8 +106,8 @@ (define (dashed-slur thick dash l) (string-append (setlineparams) - "[ " (ly-number->string dash) " " - (ly-number->string (* 10 thick)) " ] 0 d " + "[ " (ly:number->string dash) " " + (ly:number->string (* 10 thick)) " ] 0 d " (setlinewidth thick) (moveto-pair (car l)) (apply curveto (cdr l)) @@ -115,8 +115,8 @@ (define (dashed-line thick on off dx dy) (string-append (setlineparams) - "[ " (ly-number->string on) " " - (ly-number->string off) " ] 0 d " + "[ " (ly:number->string on) " " + (ly:number->string off) " ] 0 d " (setlinewidth thick) (moveto 0 0) (lineto dx dy) @@ -136,10 +136,10 @@ (define (experimental-on) "") (define (filledbox breadth width depth height) - (string-append (ly-number->string (- breadth)) - (ly-number->string (- depth)) - (ly-number->string (+ breadth width)) - (ly-number->string (+ depth height)) + (string-append (ly:number->string (- breadth)) + (ly:number->string (- depth)) + (ly:number->string (+ breadth width)) + (ly:number->string (+ depth height)) " re f ")) (define (roundfilledbox breadth width depth height blotdiam) diff --git a/scm/pdftex.scm b/scm/pdftex.scm index 873697fff5..779cb016dc 100644 --- a/scm/pdftex.scm +++ b/scm/pdftex.scm @@ -36,10 +36,10 @@ (display (object-type (car name-mag-pair))) (display (object-type (caaar font-name-alist))) - (ly-warn (string-append + (ly:warn (string-append "Programming error: No such font known " (car name-mag-pair) " " - (ly-number->string (cdr name-mag-pair)) + (ly:number->string (cdr name-mag-pair)) )) "") ; issue no command (string-append "\\" (cddr c))) @@ -67,7 +67,7 @@ "\\font\\" command "=" (car name-mag) " scaled " - (ly-number->string (inexact->exact (* 1000 (cdr name-mag)))) + (ly:number->string (inexact->exact (* 1000 (cdr name-mag)))) "\n")) (define (ez-ball c l b) @@ -160,9 +160,9 @@ (string-append "\\def\\lilyoutputscalefactor{" (number->string (cond - ((equal? (ly-unit) "mm") (/ 72.0 25.4)) - ((equal? (ly-unit) "pt") (/ 72.0 72.27)) - (else (error "unknown unit" (ly-unit))) + ((equal? (ly:unit) "mm") (/ 72.0 25.4)) + ((equal? (ly:unit) "pt") (/ 72.0 72.27)) + (else (error "unknown unit" (ly:unit))) )) "}%\n" "\\input lilyponddefs\n" @@ -200,8 +200,8 @@ (define (number->dim x) (string-append - ;;ugh ly-* in backend needs compatibility func for standalone output - (ly-number->string x) " \\outputscale ")) + ;;ugh ly:* in backend needs compatibility func for standalone output + (ly:number->string x) " \\outputscale ")) (define (placebox x y s) (string-append diff --git a/scm/ps.scm b/scm/ps.scm index 72bf34a920..ce740eaaf1 100644 --- a/scm/ps.scm +++ b/scm/ps.scm @@ -80,10 +80,10 @@ (display (object-type (car name-mag-pair))) (display (object-type (caaar font-name-alist))) - (ly-warn (string-append + (ly:warn (string-append "Programming error: No such font known " (car name-mag-pair) " " - (ly-number->string (cdr name-mag-pair)) + (ly:number->string (cdr name-mag-pair)) )) "") ; issue no command @@ -96,7 +96,7 @@ " { /" (capitalize-font-name (car name-mag)) " findfont " - "20 " (ly-number->string (cdr name-mag)) " mul " + "20 " (ly:number->string (cdr name-mag)) " mul " "output-scale div scalefont setfont } bind def " "\n")) @@ -127,24 +127,24 @@ (define (dashed-slur thick dash l) (string-append (apply string-append (map number-pair->string l)) - (ly-number->string thick) + (ly:number->string thick) " [ " - (ly-number->string dash) + (ly:number->string dash) " " - (ly-number->string (* 10 thick)) ;UGH. 10 ? + (ly:number->string (* 10 thick)) ;UGH. 10 ? " ] 0 draw_dashed_slur")) (define (dashed-line thick on off dx dy) (string-append - (ly-number->string dx) + (ly:number->string dx) " " - (ly-number->string dy) + (ly:number->string dy) " " - (ly-number->string thick) + (ly:number->string thick) " [ " - (ly-number->string on) + (ly:number->string on) " " - (ly-number->string off) + (ly:number->string off) " ] 0 draw_dashed_line")) (define (draw-line thick x1 y1 x2 y2) @@ -152,15 +152,15 @@ (string-append " 1 setlinecap 1 setlinejoin " - (ly-number->string thick) + (ly:number->string thick) " setlinewidth " - (ly-number->string x1) + (ly:number->string x1) " " - (ly-number->string y1) + (ly:number->string y1) " moveto " - (ly-number->string x2) + (ly:number->string x2) " " - (ly-number->string y2) + (ly:number->string y2) " lineto stroke" )) @@ -201,9 +201,9 @@ (define (header-end) (string-append ;; URG: now we can't use scm output without Lily - (ly-gulp-file "lilyponddefs.ps") + (ly:gulp-file "lilyponddefs.ps") " {exch pop //systemdict /run get exec} " - (ly-gulp-file "music-drawing-routines.ps") + (ly:gulp-file "music-drawing-routines.ps") "{ exch pop //systemdict /run get exec } " ;; ps-testing wreaks havoc when used with lilypond-book. @@ -233,20 +233,20 @@ (define (placebox x y s) (string-append - (ly-number->string x) " " (ly-number->string y) " {" s "} place-box\n")) + (ly:number->string x) " " (ly:number->string y) " {" s "} place-box\n")) ;; two beziers (define (bezier-sandwich l thick) (string-append (apply string-append (map number-pair->string l)) - (ly-number->string thick) + (ly:number->string thick) " draw_bezier_sandwich ")) ;; two beziers with round endings (define (bezier-bow l thick) (string-append (apply string-append (map number-pair->string l)) - (ly-number->string thick) + (ly:number->string thick) " draw_bezier_sandwich " (bezier-ending (list-ref l 3) (list-ref l 0) (list-ref l 5)) (bezier-ending (list-ref l 7) (list-ref l 0) (list-ref l 5)))) @@ -268,7 +268,7 @@ ; TODO: use HEIGHT argument (define (start-system width height) - (string-append "\n" (ly-number->string height) + (string-append "\n" (ly:number->string height) " start-system\n" "{\n" "set-ps-scale-to-lily-scale")) diff --git a/scm/pysk.scm b/scm/pysk.scm index d0abebf415..407fba31a8 100644 --- a/scm/pysk.scm +++ b/scm/pysk.scm @@ -21,7 +21,7 @@ (display (pythonify expr) port ) ) -(define (ly-warn s) (display s)) +(define (ly:warn s) (display s)) (define (pythonify q) (cond @@ -35,7 +35,7 @@ ((number? q) (number->string q)) ((eq? q '()) '()) (else (begin - (ly-warn "Unknown object to pythonify:") + (ly:warn "Unknown object to pythonify:") (write q) (newline) ) diff --git a/scm/sketch.scm b/scm/sketch.scm index d5163f0c69..3f0491cced 100644 --- a/scm/sketch.scm +++ b/scm/sketch.scm @@ -111,9 +111,9 @@ (define scale-to-unit (cond - ((equal? (ly-unit) "mm") (/ 72.0 25.4)) - ((equal? (ly-unit) "pt") (/ 72.0 72.27)) - (else (error "unknown unit" (ly-unit))) + ((equal? (ly:unit) "mm") (/ 72.0 25.4)) + ((equal? (ly:unit) "pt") (/ 72.0 72.27)) + (else (error "unknown unit" (ly:unit))) )) (define (mul-scale x) (* scale-to-unit output-scale x)) @@ -224,24 +224,24 @@ (define (dashed-slur thick dash l) (string-append (apply string-append (map number-pair->string l)) - (ly-number->string thick) + (ly:number->string thick) " [ " - (ly-number->string dash) + (ly:number->string dash) " " - (ly-number->string (* 10 thick)) ;UGH. 10 ? + (ly:number->string (* 10 thick)) ;UGH. 10 ? " ] 0 draw_dashed_slur")) (define (dashed-line thick on off dx dy) (string-append - (ly-number->string dx) + (ly:number->string dx) " " - (ly-number->string dy) + (ly:number->string dy) " " - (ly-number->string thick) + (ly:number->string thick) " [ " - (ly-number->string on) + (ly:number->string on) " " - (ly-number->string off) + (ly:number->string off) " ] 0 draw_dashed_line")) (define (repeat-slash wid slope thick) @@ -341,4 +341,4 @@ layer('Layer 1',1,1,0,0,(0,0,0)) ;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;; - \ No newline at end of file + diff --git a/scm/slur.scm b/scm/slur.scm index bec4ae0e26..aec36fc1a4 100644 --- a/scm/slur.scm +++ b/scm/slur.scm @@ -7,13 +7,13 @@ ;;;; (define (attached-to-stem slur dir) - (let* ((note-columns (ly-get-grob-property slur 'note-columns)) + (let* ((note-columns (ly:get-grob-property slur 'note-columns)) (col (if (= dir 1) (car note-columns) (car (reverse note-columns)))) - (stem (ly-get-grob-property col 'stem))) + (stem (ly:get-grob-property col 'stem))) (and - (eq? col (ly-get-spanner-bound slur dir)) + (eq? col (ly:get-spanner-bound slur dir)) stem - (ly-get-grob-property stem 'heads)))) + (ly:get-grob-property stem 'heads)))) ;; Slur-extremity-rules is a list of rules. Each rule is a pair @@ -37,7 +37,7 @@ ;; urg: don't crash on a slur without note-columns (cons (lambda (slur dir) - (< (length (ly-get-grob-property slur 'note-columns)) 1)) 'head) + (< (length (ly:get-grob-property slur 'note-columns)) 1)) 'head) ;; (cons (lambda (slur dir) (begin (display "before loose-end") (newline))#f) #f) (cons (lambda (slur dir) (not (attached-to-stem slur dir))) 'loose-end) @@ -46,12 +46,12 @@ (cons (lambda (slur dir) ;; urg, code dup - (let* ((note-columns (ly-get-grob-property slur 'note-columns)) + (let* ((note-columns (ly:get-grob-property slur 'note-columns)) (col (if (= dir 1) (car note-columns) (car (reverse note-columns)))) - (stem (ly-get-grob-property col 'stem))) + (stem (ly:get-grob-property col 'stem))) (and stem - (not (= (ly-get-grob-property slur 'direction) - (ly-get-grob-property stem 'direction)))))) 'head) + (not (= (ly:get-grob-property slur 'direction) + (ly:get-grob-property stem 'direction)))))) 'head) ;; (cons (lambda (slur dir) (begin (display "before stem") (newline))#f) #f) @@ -60,13 +60,13 @@ (and (attached-to-stem slur dir) ;; and got beam ;; urg, code dup - (let* ((note-columns (ly-get-grob-property slur 'note-columns)) + (let* ((note-columns (ly:get-grob-property slur 'note-columns)) (col (if (= dir 1) (car note-columns) (car (reverse note-columns)))) - (stem (ly-get-grob-property col 'stem))) + (stem (ly:get-grob-property col 'stem))) (and stem - (ly-get-grob-property stem 'beam) + (ly:get-grob-property stem 'beam) ;; and beam on same side as slur - (let ((beaming (ly-get-grob-property stem 'beaming))) + (let ((beaming (ly:get-grob-property stem 'beaming))) ;; (display "beaming (") (display dir) (display "): ") (write beaming) (newline) (if (pair? beaming) (>= (length (if (= dir -1) (cdr beaming) (car beaming))) diff --git a/scm/standalone.scm b/scm/standalone.scm index 346c1085a8..be65556153 100644 --- a/scm/standalone.scm +++ b/scm/standalone.scm @@ -5,7 +5,7 @@ ;;;; (c) 1998--2002 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys -(define standalone (not (defined? 'ly-gulp-file))) +(define standalone (not (defined? 'ly:gulp-file))) ;;(write standalone (current-error-port)) (define (gulp-file name) @@ -31,7 +31,7 @@ (number->string x)) " "))) -(define ly-gulp-file scm-gulp-file) -(define ly-number->string scm-number->string) +(define ly:gulp-file scm-gulp-file) +(define ly:number->string scm-number->string) -(eval-string (ly-gulp-file "lily.scm")) +(eval-string (ly:gulp-file "lily.scm")) diff --git a/scm/tex.scm b/scm/tex.scm index 5e70aff053..1e3a9bb253 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -70,10 +70,10 @@ (display (object-type (car name-mag-pair))) (display (object-type (caaar font-name-alist))) - (ly-warn (string-append + (ly:warn (string-append "Programming error: No such font known " (car name-mag-pair) " " - (ly-number->string (cdr name-mag-pair)) + (ly:number->string (cdr name-mag-pair)) )) "") ; issue no command (string-append "\\" (cddr c))) @@ -101,7 +101,7 @@ "\\font\\" command "=" (car name-mag) " scaled " - (ly-number->string (inexact->exact (* 1000 (cdr name-mag)))) + (ly:number->string (inexact->exact (* 1000 (cdr name-mag)))) "\n")) (define (ez-ball c l b) @@ -181,17 +181,17 @@ (string-append "\\def\\scaletounit{ " (number->string (cond - ((equal? (ly-unit) "mm") (/ 72.0 25.4)) - ((equal? (ly-unit) "pt") (/ 72.0 72.27)) - (else (error "unknown unit" (ly-unit))) + ((equal? (ly:unit) "mm") (/ 72.0 25.4)) + ((equal? (ly:unit) "pt") (/ 72.0 72.27)) + (else (error "unknown unit" (ly:unit))) )) " mul }%\n" "\\special{\\string! " - ;; URG: ly-gulp-file: now we can't use scm output without Lily + ;; URG: ly:gulp-file: now we can't use scm output without Lily (regexp-substitute/global #f "\n" - (ly-gulp-file "music-drawing-routines.ps") 'pre " %\n" 'post) + (ly:gulp-file "music-drawing-routines.ps") 'pre " %\n" 'post) ;; (if (defined? 'ps-testing) "/testing true def%\n" "") "}%\n" "\\begingroup\n" @@ -248,8 +248,8 @@ (define (number->dim x) (string-append - ;;ugh ly-* in backend needs compatibility func for standalone output - (ly-number->string x) " \\outputscale ")) + ;;ugh ly:* in backend needs compatibility func for standalone output + (ly:number->string x) " \\outputscale ")) (define (placebox x y s) (string-append diff --git a/scm/to-xml.scm b/scm/to-xml.scm index 67f607e8f2..ed3fe9050f 100644 --- a/scm/to-xml.scm +++ b/scm/to-xml.scm @@ -90,19 +90,19 @@ is then separated. (define (dump-duration d port) (display (open-tag 'duration - `((log . ,(duration-log d)) + `((log . ,(ly:duration-log d)) (dots . ,(duration-dot-count d)) - (numer . ,(car (duration-factor d))) - (denom . ,(cdr (duration-factor d))) + (numer . ,(car (ly:duration-factor d))) + (denom . ,(cdr (ly:duration-factor d))) ) '() ) port) (display (close-tag 'duration) port)) (define (dump-pitch p port) (display (open-tag 'pitch - `((octave . ,(pitch-octave p)) - (notename . ,(pitch-notename p)) - (alteration . ,(pitch-alteration p)) + `((octave . ,(ly:pitch-octave p)) + (notename . ,(ly:pitch-notename p)) + (alteration . ,(ly:pitch-alteration p)) ) '() ) port) (display (close-tag 'pitch) port)) @@ -163,12 +163,12 @@ is then separated. (define (music-to-xml-helper music port) (let* ( - (name (ly-get-mus-property music 'name)) - (e (ly-get-mus-property music 'element)) - (es (ly-get-mus-property music 'elements)) - (mprops (ly-get-mutable-properties music)) - (p (ly-get-mus-property music 'pitch)) - (d (ly-get-mus-property music 'duration)) + (name (ly:get-mus-property music 'name)) + (e (ly:get-mus-property music 'element)) + (es (ly:get-mus-property music 'elements)) + (mprops (ly:get-mutable-properties music)) + (p (ly:get-mus-property music 'pitch)) + (d (ly:get-mus-property music 'duration)) (ignore-props '(origin elements duration pitch element)) ) @@ -177,15 +177,15 @@ is then separated. (display (open-tag 'music (cons `(type . ,name) mprops) ignore-props) port) - (if (duration? d) + (if (ly:duration? d) (dump-duration d port)) - (if (pitch? p) + (if (ly:pitch? p) (dump-pitch p port)) (if (pair? es) (map (lambda (x) (music-to-xml-helper x port)) es) ) - (if (music? e) + (if (ly:music? e) (begin (music-to-xml-helper e port))) (display (close-tag 'music) port) diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index aaf1f366c3..6e39576bd9 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -4,7 +4,7 @@ (define (translator-property-description symbol type? description) (if (not (equal? #f (object-property symbol 'translation-doc))) (begin - (ly-warn (string-append "Redefining " (symbol->string symbol) "\n")) + (ly:warn (string-append "Redefining " (symbol->string symbol) "\n")) (exit 2) )) @@ -65,13 +65,13 @@ are given by * * The user can override beam begin or end time by pushing a wildcard entries '(begin * * * *) or '(end * * * *) resp., eg: - property Voice.autoBeamSettings push #'(end * * * *) = #(make-moment 1 4) + property Voice.autoBeamSettings push #'(end * * * *) = #(ly:make-moment 1 4) The head of the list: '( -((end * * 3 2) . ,(make-moment 1 2)) -((end 1 16 3 2) . ,(make-moment 1 4)) -((end 1 32 3 2) . ,(make-moment 1 8)) +((end * * 3 2) . ,(ly:make-moment 1 2)) +((end 1 16 3 2) . ,(ly:make-moment 1 4)) +((end 1 32 3 2) . ,(ly:make-moment 1 8)) ... ) @@ -131,7 +131,7 @@ using barchecks in polyphonic music.") ") (translator-property-description 'barNumberVisibility procedure? "Procedure that takes an int and returns whether the corresponding bar number should be printed") (translator-property-description 'beamMelismaBusy boolean? "Signal if a beam is set when automaticMelismata is set") -(translator-property-description 'beatLength moment? "The length of one beat in this time signature.") +(translator-property-description 'beatLength ly:moment? "The length of one beat in this time signature.") (translator-property-description 'breakAlignOrder list? "Defines the order in which prefatory matter (clefs, key signatures) appears, eg. this puts the key signatures after the bar lines: @@ -176,8 +176,8 @@ arpeggios that cross staves. (translator-property-description 'currentBarNumber integer? "Contains the current barnumber. This property is incremented at every barline. ") -(translator-property-description 'currentCommandColumn ly-grob? "Grob that is X-parent to all current breakable (clef, key signature, etc.) items.") -(translator-property-description 'currentMusicalColumn ly-grob? "Grob that is X-parent to all non-breakable items (note heads, lyrics, etc.).") +(translator-property-description 'currentCommandColumn ly:grob? "Grob that is X-parent to all current breakable (clef, key signature, etc.) items.") +(translator-property-description 'currentMusicalColumn ly:grob? "Grob that is X-parent to all non-breakable items (note heads, lyrics, etc.).") (translator-property-description 'defaultBarType string? "Sets the default type of bar line. Available bar types: [FIXME]; This variable is typically read at Score level, so overriding @@ -232,7 +232,7 @@ in a context. This is done using the @code{Font_size_engraver}.") (translator-property-description 'forceClef boolean? "Show clef symbol, even if it hasn't changed. Only active for the first clef after the property is set, not for the full staff.") (translator-property-description 'graceAccidentalSpace number? "amount space to alot for an accidental") -(translator-property-description 'graceAlignPosition dir? "put the grace note before or after the main note?") +(translator-property-description 'graceAlignPosition ly:dir? "put the grace note before or after the main note?") (translator-property-description 'highStringOne boolean? "Whether the 1st string is the string with highest pitch on the instrument (used by the automatic string selector).") (translator-property-description 'instr markup? "see @code{instrument}") @@ -263,9 +263,9 @@ signature at this point in the measure. The format is the same as for keySignat ) (translator-property-description 'localKeySignatureChanges list? "Experimental. [DOCME]") -(translator-property-description 'measureLength moment? "Length of one +(translator-property-description 'measureLength ly:moment? "Length of one measure in the current time signature last?") -(translator-property-description 'measurePosition moment? " How much +(translator-property-description 'measurePosition ly:moment? " How much of the current measure (measured in whole notes) have we had. This can be set manually to create incomplete measures (anacrusis, upbeat), the start of the music. @@ -284,7 +284,7 @@ not less than minimumFret") (translator-property-description 'autoBeaming boolean? "If set to true then beams are generated automatically.") (translator-property-description 'noDirection boolean? "Don't set directions by a2-engraver when part-combining.") -(translator-property-description 'oneBeat moment? " How long does one beat in the current time signature last?") +(translator-property-description 'oneBeat ly:moment? " How long does one beat in the current time signature last?") (translator-property-description 'othersolo boolean? "FIXME") (translator-property-description 'pedalSustainStrings list? "List of string to print for sustain-pedal. Format is (UP UPDOWN DOWN), where each of the three is the string to print when @@ -294,7 +294,7 @@ this is done with the pedal.") (translator-property-description 'phrasingPunctuation string? "") (translator-property-description 'rehearsalMark number-or-string? "") -(translator-property-description 'regularSpacingDelta moment? "TODO") +(translator-property-description 'regularSpacingDelta ly:moment? "TODO") (translator-property-description 'repeatCommands list? "This property is read to find any command of the form (volta . X), where X is a string or #f") (translator-property-description 'scriptDefinitions list? " Description of scripts. This is used by Script_engraver for typesetting note-super/subscripts. See @file{scm/script.scm} for more information @@ -377,7 +377,7 @@ entirely. This has the same effect as setting both @code{tupletNumberVisibility} and @code{tupletBracketVisibility} to @code{#f}, but as this does not even create any grobs, this setting uses less memory and time.") -(translator-property-description 'tupletSpannerDuration moment? " +(translator-property-description 'tupletSpannerDuration ly:moment? " Normally a tuplet bracket is as wide as the @code{ imes} expression that gave rise to it. By setting this property, you can make brackets last shorter. Example @@ -385,7 +385,7 @@ property, you can make brackets last shorter. Example @example @@lilypond[verbatim,fragment] context Voice imes 2/3 @{ - property Voice.tupletSpannerDuration = #(make-moment 1 4) + property Voice.tupletSpannerDuration = #(ly:make-moment 1 4) [c8 c c] [c c c] @} @@end lilypond @@ -401,7 +401,7 @@ itself. .") (translator-property-description 'voltaOnThisStaff boolean? "Normally, volta brackets are put only on the topmost staff. Setting this variable to true, will force a bracket to be on this staff as well.") -(translator-property-description 'voltaSpannerDuration moment? "maximum duration of the volta bracket. +(translator-property-description 'voltaSpannerDuration ly:moment? "maximum duration of the volta bracket. Set to a duration to control the size of the brackets printed by @code{\\alternative}. It specifies the number of whole notes duration diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 89552fc3bb..7223cc30a2 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1029,7 +1029,46 @@ if 1: conversions.append (((1,7,2), conv, '\\spanrequest -> #(make-span-event .. ), \script -> #(make-articulation .. )')) - +if 1: + def conv(str): + str = re.sub (r'\(ly-', '(ly:', str) + + changed = [ + r'duration\?', + r'font-metric\?', + r'molecule\?', + r'moment\?', + r'music\?', + r'pitch\?', + 'make-duration', + 'music-duration-length', + 'duration-log', + 'duration-dotcount', + 'intlog2', + 'duration-factor', + 'transpose-key-alist', + 'get-system', + 'get-broken-into', + 'get-original', + 'set-point-and-click!', + 'make-moment', + 'make-pitch', + 'pitch-octave', + 'pitch-alteration', + 'pitch-notename', + 'pitch-semitones', + r'pitch<\?', + r'dir\?', + 'music-duration-compress', + ] + + origre = r'\b(%s)' % string.join (changed, '|') + + str = re.sub (origre, r'ly:\1',str) + return str + + conversions.append (((1,7,3), conv, 'ly- -> ly:')) + ################################ # END OF CONVERSIONS ################################ -- 2.39.2