From ed02e6f3ab222cb7527afe922ac88efbc2a384d1 Mon Sep 17 00:00:00 2001 From: Mark Knoop Date: Thu, 28 Jul 2022 11:28:51 +0100 Subject: [PATCH 1/4] Remove unused definition, resolves error --- annotate/export.ily | 5 ----- 1 file changed, 5 deletions(-) diff --git a/annotate/export.ily b/annotate/export.ily index 1f8e3ae..d1cb6f2 100644 --- a/annotate/export.ily +++ b/annotate/export.ily @@ -35,11 +35,6 @@ %%%% General export helper routines %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Provide a global string-list that output functions append their lines to. -% This is finally used to write to log files. -#(cond ((not (defined? 'annotate-export-stringlist)) - (define annotate-export-stringlist '()))) - % Variable holding the string list to export \registerOption scholarly.annotate.export.strings #'() From cf3aa706eafbcc2b7e15b8b33bce8cc9c264cc3a Mon Sep 17 00:00:00 2001 From: Mark Knoop Date: Thu, 28 Jul 2022 11:31:10 +0100 Subject: [PATCH 2/4] Add argument to calls to format --- annotate/engraver.ily | 2 +- annotate/export-latex.ily | 12 ++++++------ annotate/export.ily | 8 ++++---- annotate/format.ily | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/annotate/engraver.ily b/annotate/engraver.ily index a348839..492313d 100644 --- a/annotate/engraver.ily +++ b/annotate/engraver.ily @@ -177,5 +177,5 @@ annotationEngraver = target))) ;; skip invalid entries (if er (er annotations) - (ly:warning (format "Invalid annotation export target: ~a. Skipping!" target))))) + (ly:warning (format #f "Invalid annotation export target: ~a. Skipping!" target))))) (getOption '(scholarly annotate export-targets)))))))) diff --git a/annotate/export-latex.ily b/annotate/export-latex.ily index 693a5e5..5d12fdc 100644 --- a/annotate/export-latex.ily +++ b/annotate/export-latex.ily @@ -62,7 +62,7 @@ ; Currently we don't provide any intelligent handling of ; values that are not in the above list. (begin - (ly:warning (format "Did not find a lilyglyphs representation for ~a" frac)) + (ly:warning (format #f "Did not find a lilyglyphs representation for ~a" frac)) "NA"))) % If requested format the measure position using lilyglyphs commands @@ -72,17 +72,17 @@ (beat-length (/ 1 (cdr meter))) (beat-lily (lilyglyphs-lookup beat-length)) (our-beat (assq-ref loc-props 'our-beat)) - (beat-string (format "~a.\\,~a" our-beat beat-lily)) + (beat-string (format #f "~a.\\,~a" our-beat beat-lily)) (beat-fraction (assq-ref loc-props 'beat-fraction)) (beat-part (assq-ref loc-props 'beat-part))) (if (= 0 beat-fraction) beat-string - (format "~a,\\,~a" beat-string + (format #f "~a,\\,~a" beat-string (let* ((part-numerator (+ 1 (ly:moment-main-numerator beat-part))) (sub-beat-length (/ 1 (ly:moment-main-denominator beat-part)))) - (format "~a. ~a" part-numerator + (format #f "~a. ~a" part-numerator (lilyglyphs-lookup sub-beat-length))))))) @@ -99,7 +99,7 @@ ;; handle known keys ((input-file-name) (car val)) ((rhythmic-location) - (format "~a,~a" (car val) (ly:moment-main (cdr val)))) + (format #f "~a,~a" (car val) (ly:moment-main (cdr val)))) ((beat-string-lilyglyphs) (lilyglyphs-beat-string val)) (else @@ -144,7 +144,7 @@ (map (lambda (p) (let ((prop (format-property p))) - (format " ~a={~a}" (car prop)(cdr prop)))) + (format #f " ~a={~a}" (car prop)(cdr prop)))) (append regular-props location-props))) ) diff --git a/annotate/export.ily b/annotate/export.ily index d1cb6f2..c43b2e6 100644 --- a/annotate/export.ily +++ b/annotate/export.ily @@ -82,7 +82,7 @@ #(define (write-output-file ext) (let* ((logfile - (format "~a.annotations.~a" + (format #f "~a.annotations.~a" (getOption '(scholarly annotate internal basename)) ext))) (ly:message "writing '~a' ..." logfile) (with-output-to-file logfile @@ -103,9 +103,9 @@ ;; workaround for a problem that sometimes the paperColumn gets ;; lost along the way. In that case the location is manually ;; set to measure zero - which is impossible. - (format "Sorry, rhythmic position could not be determined.\nInput location at ~a" + (format #f "Sorry, rhythmic position could not be determined.\nInput location at ~a" (assq-ref ann 'location)) - (format "Measure ~a, beat ~a" + (format #f "Measure ~a, beat ~a" (assq-ref props 'measure-no) (beat-string props))))) @@ -122,7 +122,7 @@ (lambda (ann) (begin (ly:input-message (assq-ref ann 'location) "\nAnnotation:") - (ly:message (format " ~a" (format-location ann))) + (ly:message (format #f " ~a" (format-location ann))) (write-lines (format-property-messages ann (get-skipped-attributes #f)) diff --git a/annotate/format.ily b/annotate/format.ily index 0f4f1cd..559168c 100644 --- a/annotate/format.ily +++ b/annotate/format.ily @@ -38,11 +38,11 @@ (if (ly:music? music) (case (ly:music-property music 'name) ((TimeSignatureMusic) - (format "\\time ~a/~a" + (format #f "\\time ~a/~a" (ly:music-property music 'numerator) (ly:music-property music 'denominator))) ((KeyChangeEvent) - (format "Key: ~a" (ly:music-property music 'tonic))) + (format #f "Key: ~a" (ly:music-property music 'tonic))) (else "(LilyPond Music)")) "No music found")) @@ -53,7 +53,7 @@ (let ((prop-key (car prop)) (prop-value (cdr prop))) - (format " ~a: ~a" + (format #f " ~a: ~a" (or (getChildOptionWithFallback '(scholarly annotate attribute-labels) prop-key #f) prop-key) ; keep that a (cond) expression because there might be more special types to come From 873e8866614f945acf310a244124186121962daa Mon Sep 17 00:00:00 2001 From: Mark Knoop Date: Sun, 20 Nov 2022 17:13:39 +0000 Subject: [PATCH 3/4] Correct editorial-markup usage example --- usage-examples/editorial-markup.ly | 1 + 1 file changed, 1 insertion(+) diff --git a/usage-examples/editorial-markup.ly b/usage-examples/editorial-markup.ly index 12aff4e..9959a9b 100644 --- a/usage-examples/editorial-markup.ly +++ b/usage-examples/editorial-markup.ly @@ -2,6 +2,7 @@ \include "oll-core/package.ily" \loadModule scholarly.editorial-markup +\loadModule scholarly.annotate \markup \bold { Usage examples for \typewriter "\\editorialMarkup" } \markup \vspace #1 From 3a4ff27ac8d47650628330af5bb92695dedc1995 Mon Sep 17 00:00:00 2001 From: Mark Knoop Date: Mon, 21 Nov 2022 16:21:12 +0000 Subject: [PATCH 4/4] balloon-text: update for 2.23.80 Note this is still marked deprecated. --- annotate/legacy.ily | 4 ++-- usage-examples/balloon-text.ly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/annotate/legacy.ily b/annotate/legacy.ily index a67d7a5..43ad690 100644 --- a/annotate/legacy.ily +++ b/annotate/legacy.ily @@ -111,8 +111,8 @@ (else ;; item is symbol list: annotate the next item of the given grob name #{ - \once \override #item #'input-annotation = #props - \once \override #item color = #col + \once \override #item . input-annotation = #props + \once \override #item . color = #col #})))) #{ #tweak-command diff --git a/usage-examples/balloon-text.ly b/usage-examples/balloon-text.ly index 1f47da8..c714ee3 100644 --- a/usage-examples/balloon-text.ly +++ b/usage-examples/balloon-text.ly @@ -1,4 +1,4 @@ -\version "2.19.56" +\version "2.23.80" % This file is deprecated since (at the moment) balloon text only works with % the 'legacy module. @@ -9,7 +9,7 @@ music = { \new Voice \with { \consists "Balloon_engraver" } { - \once \override BalloonTextItem #'X-extent = ##f + \once \override BalloonTextItem.X-extent = ##f \criticalRemark \with{ message = "message/balloon-text"