use simple-format by default, fancy-format for ice-9

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 42c04b6e57f573047f922a53a634f5b50a12ce79..da44cf84cf943527cb786c9b5d0ef861776f8024 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -56,7 +56,7 @@
         (is-eps (string-match "\\.eps$" name))
         (paper-size-string (if is-eps
                                " -dEPSCrop "
-                               (format "-dDEVICEWIDTHPOINTS=~,2f \
+                               (fancy-format "-dDEVICEWIDTHPOINTS=~,2f \
 -dDEVICEHEIGHTPOINTS=~,2f "
                                        paper-width paper-height )))
 

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 2792ef7956197d0d3dcb5bf2518fe5f81944ad47..302ff25315ecfa0198f8c8bf95681c08a4161086 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -287,10 +287,10 @@ Line thickness is given by @var{th}, fret & string spacing by
           (fret-count (+ (- (cadr fret-range) (car fret-range)) 1))
            (label-text 
               (cond
-              ((equal?   number-type  'roman-lower) (format #f "~(~:@r~)" base-fret))
-              ((equal?  number-type 'roman-upper) (format #f "~:@r" base-fret))
-              ((equal? 'arabic number-type)  (format #f "~d" base-fret))
-              (else (format #f  "~(~:@r~)" base-fret)))))
+              ((equal?   number-type  'roman-lower) (fancy-format #f "~(~:@r~)" base-fret))
+              ((equal?  number-type 'roman-upper) (fancy-format #f "~:@r" base-fret))
+              ((equal? 'arabic number-type)  (fancy-format #f "~d" base-fret))
+              (else (fancy-format #f  "~(~:@r~)" base-fret)))))
        (ly:stencil-translate-axis 
            (sans-serif-stencil layout props (* size label-font-mag) label-text) 
                        (* size (+ fret-count label-vertical-offset)) Y)))

diff --git a/scm/lily.scm b/scm/lily.scm
index 045ac460d60913223c330d687c8d9fc239694f70..3eb98f71f382ecbd8c1f978c4753c9c652e4a3e0 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -85,16 +85,26 @@ on errors, and print a stack trace.")
 
 (use-modules (ice-9 regex)
             (ice-9 safe)
+            (ice-9 format)
              (ice-9 optargs)
             (oop goops)
             (srfi srfi-1)
             (srfi srfi-13)
             (srfi srfi-14)
             (scm clip-region)
-
             )
 
 
+(define-public (ergonomic-simple-format dest . rest)
+  "Like ice-9 format, but without the memory consumption."
+  
+  (if (string? dest)
+      (apply simple-format (cons #f (cons dest rest)))
+      (apply simple-format (cons dest rest))))
+
+(define-public fancy-format format)
+(define format ergonomic-simple-format)
+
 ;; my display
 (define-public (myd k v) (display k) (display ": ") (display v) (display ", "))
 

diff --git a/scm/stencil.scm b/scm/stencil.scm
index 320b54ee734058cda2f493d5ffb359bd78bbbadc..4e6a7e5d59215bc0563a91e80da7ef18abddaa95 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -211,9 +211,9 @@ encloses the contents.
                                               ((interval-empty? extent)
                                                (format "empty"))
                                               (is-length
-                                               (format "~$" (interval-length extent)))
+                                               (fancy-format "~$" (interval-length extent)))
                                               (else
-                                               (format "(~$,~$)"
+                                               (fancy-format "(~$,~$)"
                                                        (car extent) (cdr extent)))))))
              (arrows (ly:stencil-translate-axis 
                       (dimension-arrows (cons 0 (interval-length extent)))