* scripts/musicxml2ly.py (NonDentedHeadingFormatter.format_headi):

[lilypond.git] / scm / output-gnome.scm

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 011811b64e1ec013e65f990cbb4a591f79947dc9..db1a496616f9a95294497770be336b42df8f554f 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -100,7 +100,7 @@ lilypond -fgnome input/simple-song.ly
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; helper functions
 
-(define (utf8 i)
+(define (utf-8 i)
   (cond
    ((< i #x80) (list (integer->char i)))
    ((< i #x800) (map integer->char
@@ -113,19 +113,19 @@ lilypond -fgnome input/simple-song.ly
           (list (+ #xe0 x)
                 (+ #x80 (quotient y #x40))
                 (+ #x80 (modulo y #x40))))))
-   (else (begin (stderr "programming-error: utf8 too big:~x\n" i)
+   (else (begin (stderr "programming-error: utf-8 too big:~x\n" i)
                (list (integer->char 32))))))
 
-(define (integer->utf8-string integer)
-  (list->string (utf8 integer)))
+(define (integer->utf-8-string integer)
+  (list->string (utf-8 integer)))
 
-(define (char->utf8-string char)
-  (list->string (utf8 (char->integer char))))
+(define (char->utf-8-string char)
+  (list->string (utf-8 (char->integer char))))
 
-(define (string->utf8-string string)
+(define (string->utf-8-string string)
   (apply
    string-append
-   (map (lambda (x) (char->utf8-string x)) (string->list string))))
+   (map (lambda (x) (char->utf-8-string x)) (string->list string))))
 
 (define (music-font? font)
   (let ((family (car (font-name-style font))))
@@ -194,54 +194,6 @@ lilypond -fgnome input/simple-song.ly
       (ly:all-stencil-expressions)
       (ly:all-output-backend-commands)))
 
-(define (beam width slope thick blot)
-  (define cursor '(0 . 0))
-  (define (rmoveto def x y)
-    (set! cursor (cons (+ x (car cursor)) (+ y (cdr cursor))))
-    (moveto def (car cursor) (cdr cursor)))
-  (define (rlineto def x y)
-    (set! cursor (cons (+ x (car cursor)) (+ y (cdr cursor))))
-    (lineto def (car cursor) (cdr cursor)))
-  (let* ((def (make <gnome-canvas-path-def>))
-        (bezier (make <gnome-canvas-bpath>
-                  #:parent (canvas-root)
-                  #:fill-color "black"
-                  #:outline-color "black"
-                  #:width-units blot
-                  #:join-style 'round))
-        (t (- thick blot))
-        (w (- width blot))
-        (h (* w slope)))
-    
-    (reset def)
-    (rmoveto def (/ blot 2) (/ t 2))
-    (rlineto def w (- h))
-    (rlineto def 0 (- t))
-    (rlineto def (- w) h)
-    (rlineto def 0 t)
-    (closepath def)
-    (set-path-def bezier def)
-    bezier))
-
-(define (square-beam width slope thick blot)
-  (let* ((def (make <gnome-canvas-path-def>))
-        (y (* (- width) slope))
-        (props (make <gnome-canvas-bpath>
-                 #:parent (canvas-root)
-                 #:fill-color "black"
-                 #:outline-color "black"
-                 #:width-units 0.0)))
-    
-    (reset def)
-    (moveto def 0 0)
-    (lineto def width y)
-    (lineto def width (- y thick))
-    (lineto def 0 (- thick))
-    (lineto def 0 0)
-    (closepath def)
-    (set-path-def props def)
-    props))
-
 ;; two beziers
 (define (bezier-sandwich lst thick)
   (let* ((def (make <gnome-canvas-path-def>))
@@ -292,25 +244,18 @@ lilypond -fgnome input/simple-song.ly
     (set-path-def props def)
     props))
 
-;; FIXME: naming
-(define (filledbox breapth width depth height)
-  (make <gnome-canvas-rect>
-    #:parent (canvas-root)
-    #:x1 (- breapth) #:y1 depth #:x2 width #:y2 (- height)
-    #:fill-color "black"
-    #:join-style 'miter))
 
 ;; FIXME: the framework-gnome backend needs to see every item that
 ;; gets created.  All items created here must should be put in a group
 ;; that gets returned.
-(define (glyph-string font postscript-font-name x-y-named-glyphs)
+(define (glyph-string font postscript-font-name w-x-y-named-glyphs)
   (for-each
    (lambda (x)
 
      ;; UGR, glyph names not found
      (stderr "GLYPH:~S\n" (caddr x))
      (stderr "ID:~S\n" (ly:font-glyph-name-to-charcode font (caddr x)))
-     (placebox (car x) (cadr x)
+     (placebox (cadr x) (caddr x)
               (make <gnome-canvas-text>
                 #:parent (canvas-root)
                 ;;#:x 0.0 #:y (if (music-font? font) 0.15 0.69)
@@ -320,9 +265,9 @@ lilypond -fgnome input/simple-song.ly
                 #:size-points (canvas-font-size font)
                 #:size-set #t
                 #:text
-                (integer->utf8-string
-                 (ly:font-glyph-name-to-charcode font (caddr x))))))
-   x-y-named-glyphs))
+                (integer->utf-8-string
+                 (ly:font-glyph-name-to-charcode font (cadddr x))))))
+   w-x-y-named-glyphs))
 
 (define (grob-cause offset grob)
   grob)
@@ -380,10 +325,10 @@ lilypond -fgnome input/simple-song.ly
     #:size-points (canvas-font-size font)
     #:size-set #t
     #:text (if (integer? s)
-              (integer->utf8-string s)
-              (string->utf8-string s))))
+              (integer->utf-8-string s)
+              (string->utf-8-string s))))
 
-(define (utf8-string pango-font-description string)
+(define (utf-8-string pango-font-description string)
   (make <gnome-canvas-text>
     #:parent (canvas-root)
     #:x 0.0 #:y 0.0