*** empty log message ***

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 80ae95f5b2c0d8493b2b1c08954ddedf7b4793d4..93034f9daafce929b29b8155a90689986f955f7f 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -157,8 +157,6 @@ export LD_LIBRARY_PATH=$HOME/usr/pkg/guile-gnome/lib:$LD_LIBRARY_PATH
 
 # simple test
 guile -s ../src/libgnomecanvas/examples/canvas.scm
-=======
->>>>>>> 1.21
 
 
 (debug-enable 'backtrace)
@@ -173,20 +171,10 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
  (srfi srfi-13)
  (lily)
  (gnome gtk)
-<<<<<<< output-gnome.scm
  (gnome gtk gdk-event)
  ;; the name of the module will change to canvas rsn
  (gnome gw libgnomecanvas))
  ;;(gnome gw canvas))
-=======
- (gnome gtk gdk-event))
-
-;; the name of the module will change to canvas rsn
-(if (resolve-module '(gnome gw canvas))
-    (use-modules (gnome gw canvas))
-    (use-modules (gnome gw libgnomecanvas)))
-
->>>>>>> 1.21
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; module entry
@@ -244,15 +232,9 @@ guile -s ../src/libgnomecanvas/examples/canvas.scm
 
 ;; minimal intercept list:
 (define output-interface-intercept
-<<<<<<< output-gnome.scm
   '(
     no-origin
 ))
-=======
-  '(comment
-    define-origin
-    no-origin))
->>>>>>> 1.21
 
 (map (lambda (x) (module-define! this-module x dummy))
      output-interface-intercept)

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index eba247bc61ef5673cbaf5e3494395a59d284de92..d034cf6ef9b24398242fecdeffc5aa47b3950f10 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -103,7 +103,6 @@
 ;;  (* (/ 72.27 25.40) x))
 
 ;; do nothing in .scm output
-(define-public (comment s) "")
 
 (define-public (ly:numbers->string lst)
   (string-join (map ly:number->string lst) " "))

diff --git a/scm/output-pdf.scm b/scm/output-pdf.scm
index 81ffdb0489e43b9988fef02f43ba45c800066e32..691e8f3c558e2a9267208a0c2312d8ac6080c99a 100644 (file)
--- a/scm/output-pdf.scm
+++ b/scm/output-pdf.scm
@@ -60,9 +60,6 @@
                   (lineto 0 (/ thick 2))
                   (closefill))))
 
-(define (comment s) 
-  (string-append "% " s "\n"))
-
 (define (brack-traject pair ds alpha)
   (let ((alpha-rad (* alpha (/ 3.141592654 180))))
     (cons (+ (car pair) (* (cos alpha-rad) ds))
@@ -131,7 +128,6 @@
                   (rlineto (- xwid) 0)
                   (closefill))))
 
-(define (end-output) "")
 
 (define (experimental-on) "")
 

diff --git a/scm/output-pdftex.scm b/scm/output-pdftex.scm
index 5d5702e01f78b4c453f0a02eecb419999acad170..09d448c1f682613e4d9c243e191acba014f6af7c 100644 (file)
--- a/scm/output-pdftex.scm
+++ b/scm/output-pdftex.scm
@@ -100,16 +100,6 @@
     (string-append "\\embeddedpdf{" (get-output-string os) "}")))
 
 
-(define (comment s)
-  (simple-format #f "% ~a\n" s))
-
-(define (end-output) 
-  (begin
-                                       ; uncomment for some stats about lily memory      
-                                       ;               (display (gc-stats))
-    (string-append "%\n\\lilypondend\n"
-                                       ; Put GC stats here.
-                  )))
 
 (define (experimental-on)
   "")

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 3057f513a7de8539a70b1c22ef6bf791cd3117bd..4179873e98519b76d7528d049014a41b96c35dc3 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -17,9 +17,7 @@
 
 (define-module (scm output-ps)
   #:re-export (quote)
-  #:export (define-fonts
-            unknown
-            select-font
+  #:export (unknown
             blank
             dot
             beam
@@ -31,16 +29,9 @@
             symmetric-x-triangle
             ez-ball
             comment
-            end-output
-            experimental-on
             repeat-slash
-            header-end
-            header
             placebox
             bezier-sandwich
-            start-system
-            stop-system
-            stop-last-system
             horizontal-line
             filledbox
             round-filled-box
@@ -50,8 +41,6 @@
             draw-line
             define-origin
             no-origin
-            start-page
-            stop-page
             ))
 
 (use-modules (guile)
@@ -113,9 +102,6 @@
     (ps-font-command font) " setfont " 
    "(\\" (ly:inexact->string i 8) ") show" ))
 
-(define (comment s)
-  (string-append "% " s "\n"))
-
 (define (dashed-line thick on off dx dy)
   (string-append 
    (ly:number->string dx) " "
@@ -160,9 +146,6 @@
    (ly:number->string x2) " "
    (ly:number->string y2) " lineto stroke"))
 
-(define (end-output)
-  "\nend-lilypond-output\n")
-
 (define (ez-ball ch letter-col ball-col)
   (string-append
    " (" ch ") "

diff --git a/scm/output-sketch.scm b/scm/output-sketch.scm
index 69af56f3518309cfd6ba4b1978a58f0444a32208..afe39c407605954d5d8b46a966b3f2a5d689d4a2 100644 (file)
--- a/scm/output-sketch.scm
+++ b/scm/output-sketch.scm
@@ -48,7 +48,6 @@
 ; ((eq? keyword 'dashed-line thick on off dx dy)
 ; ((eq? keyword 'dashed-slur thick dash l)
 ; ((eq? keyword 'define-origin a b c ) "")
-; ((eq? keyword 'end-output)
 ; ((eq? keyword 'experimental-on) "")
 ; ((eq? keyword 'ez-ball ch letter-col ball-col)
 ; ((eq? keyword 'filledbox x y breapth width depth height)

diff --git a/scm/output-sodipodi.scm b/scm/output-sodipodi.scm
index 22281e2454080e3b1c690308cdf6bb556be0e677..9875a1938c66feb42862f31679c6a3dd64d65601 100644 (file)
--- a/scm/output-sodipodi.scm
+++ b/scm/output-sodipodi.scm
@@ -44,7 +44,6 @@
 ;;;    define-fonts
 ;;;    no-origin
 ;;;    start-system
-;;;    end-output
 ;;;    header
 ;;;    comment
 ;;;    stop-last-system
@@ -247,9 +246,6 @@
 (define (define-fonts paper font-list)
   (comment (format #f "Fonts used: ~S" font-list)))
 
-(define (end-output)
-  "</g></svg>")
-
 (define (filledbox breapth width depth height)
   (round-filled-box breapth width depth height line-thickness))
 

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 6a0cebe77ec9f5372fe2b74c9b9febb8f3234f70..0943751436fd0d2a1927ef68c09ac95c3ea44416 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -98,17 +98,6 @@
           (lambda () (ps-output-expression expr (current-output-port))))))
     (string-append "\\embeddedps{" ps-string "}")))
   
-(define (comment s)
-  (string-append "% " s "\n"))
-
-(define (end-output)
-  (begin
-    ;; uncomment for some stats about lily memory        
-    ;; (display (gc-stats))
-    (string-append
-     "\\lilypondend\n"
-     ;; Put GC stats here.
-     )))
 
 (define (repeat-slash w a t)
   (embedded-ps (list 'repeat-slash  w a t)))