From 4c0e2c1923d9f736025ef264e125626900f24da8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 13 Jun 2004 21:55:33 +0000 Subject: [PATCH] *** empty log message *** --- scm/output-gnome.scm | 18 ------------------ scm/output-lib.scm | 1 - scm/output-pdf.scm | 4 ---- scm/output-pdftex.scm | 10 ---------- scm/output-ps.scm | 19 +------------------ scm/output-sketch.scm | 1 - scm/output-sodipodi.scm | 4 ---- scm/output-tex.scm | 11 ----------- 8 files changed, 1 insertion(+), 67 deletions(-) diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm index 80ae95f5b2..93034f9daa 100644 --- 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 eba247bc61..d034cf6ef9 100644 --- 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 81ffdb0489..691e8f3c55 100644 --- 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 5d5702e01f..09d448c1f6 100644 --- 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 3057f513a7..4179873e98 100644 --- 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 69af56f351..afe39c4076 100644 --- 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 22281e2454..9875a1938c 100644 --- 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) - "") - (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 6a0cebe77e..0943751436 100644 --- 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))) -- 2.39.2