fix roundfilledbox definition

diff --git a/ChangeLog b/ChangeLog
index 0de1b315d63fe8104ce86f91823e6c7b0c2ed3a7..98b7decd510f9091d7148cbfaeb2135ad75885a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-07-23  Han-Wen  <hanwen@cs.uu.nl>
 
+       * scm/sketch.scm: fix roundfilledbox definition
+
        * lily/lily-guile.cc (robust_list_ref): be sensible with negative
        argument. This fixes too-long stems on half and quarter notes.
 

diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely
index e18ef3f5241d6318357bfe70ff820ddc267bddf1..5f653021f1208b0280cea88a2889b5d59fad2508 100644 (file)
--- a/Documentation/user/internals.itely
+++ b/Documentation/user/internals.itely
@@ -133,7 +133,10 @@ section.
 @node Output formats
 @section Output formats
 
-LilyPond can output processed music in different output formats.  
+LilyPond can output processed music in different output formats.  They
+can be used by invoking lilypond directly, i.e. not through ly2dvi,
+and supplying the @code{-f} command line option.  See also
+@ref{Invoking LilyPond}.
 
 @menu
 * @TeX{} output::               
@@ -297,7 +300,8 @@ dropped in future versions.
 @subsection Sketch output
 
 @uref{http://sketch.sourceforge.net,Sketch} is a Free vector drawing
-program. LilyPond includes bare bones output for Sketch version 0.7.
+program. LilyPond includes bare bones output for Sketch version
+0.7.
 
 @cindex Sketch
 @cindex vector drawing

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index a7662b419ebd1cceea22deb3c8beaeb303123f60..0cbbec4fe0132471001209aab3feea888f80ea0b 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -1,3 +1,4 @@
+@c -*-texinfo-*-
 @node Invoking LilyPond
 @chapter Invoking LilyPond
 
@@ -48,11 +49,21 @@ set various debugging options.
 
 
 
-@item -f,--format=@var{format} Output format for sheet music. Choices
-are @code{tex} (for @TeX{} output, to be processed with plain @TeX{},
-or through ly2dvi), @code{pdftex} for PDF@TeX{} input, @code{ps} (for
-PostScript), @code{scm} (for a Scheme dump), and @code{as} (for
-ASCII-art).
+@item -f,--format=@var{format}
+@c
+@c
+Output format for sheet music. Choices are @code{tex} (for @TeX{}
+output, to be processed with plain @TeX{}, or through ly2dvi),
+@code{pdftex} for PDF@TeX{} input, @code{ps} (for PostScript),
+@code{scm} (for a Scheme dump), @code{sk} (for Sketch) and @code{as}
+(for ASCII-art).
+
+@cindex output format, setting
+@cindex Sketch output
+@cindex ASCII-art output
+@cindex PDFTeX output
+@cindex PostScript output
+@cindex Scheme dump
 
 Unless you have special requirements, you should use @TeX{}
 output. All other options are experimental.

diff --git a/scm/ascii-script.scm b/scm/ascii-script.scm
index 53c3aeedd1aee45eba244da38ad2d932a4606a46..5f5c09752a2988a34e18683d2988430fe4e0c4a5 100644 (file)
--- a/scm/ascii-script.scm
+++ b/scm/ascii-script.scm
@@ -154,7 +154,7 @@
                (if (<= dy 1) "-" "="))
          (func "h-line" dx))))))
 
-(define (roundfilledbox breapth width depth height)
+(define (roundfilledbox breapth width depth height blot)
   (filledbox breapth width depth height))
 
 (define (font-load-command name-mag command)

diff --git a/scm/lily.scm b/scm/lily.scm
index dbb9eeba2a43d10a4cd3952ac803cd332d22bd34..e7dc6a3d69861f6777c93f54f8493cddd83e3e50 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -140,7 +140,7 @@
     ("ps" . ,ps-output-expression)
     ("scm" . ,write)
     ("as" . ,as-output-expression)
-    ("pysk" . ,pysk-output-expression)
+;    ("pysk" . ,pysk-output-expression)
     ("sketch" . ,sketch-output-expression)
     ("pdftex" . ,pdftex-output-expression)
 ))

diff --git a/scm/pdf.scm b/scm/pdf.scm
index 684a986fbf1a220dbba3adccaa77ebba034d2df2..8c2f1722f7b439c8cc499342aa1713e814224714 100644 (file)
--- a/scm/pdf.scm
+++ b/scm/pdf.scm
@@ -151,7 +151,7 @@
 ;;                  (ly-number->string (radius))
 ;;                  " ??? "))) ;; how to draw a circle in PDF?
 ;;
-;;(define (roundfilledbox x width y height blotdiam)
+;;(define (roundfilledbox x y width height blotdiam)
 ;;  (string-append " "
 ;;    (dot x y blotdiam)
 ;;    (dot (+ x width) y blotdiam)
@@ -163,7 +163,7 @@
 ;;
 ;; WORKAROUND:
 ;;
-(define (roundfilledbox breadth width depth height) 
+(define (roundfilledbox breadth width depth height blot) 
   (filledbox breadth width depth height))
 ;;
 

diff --git a/scm/pdftex.scm b/scm/pdftex.scm
index f193a37ed7e0952a78bc4c3772a85845bf988582..3d38d7a45e215d387ec05dcd7a9e809c0d3cf7e5 100644 (file)
--- a/scm/pdftex.scm
+++ b/scm/pdftex.scm
@@ -204,8 +204,8 @@
    "depth " (number->dim depth)
    "height " (number->dim height) " "))
 
-(define (roundfilledbox x width y height blotdiam)
-  (embedded-pdf (list 'roundfilledbox  x width y height blotdiam)))
+(define (roundfilledbox x y width height blotdiam)
+  (embedded-pdf (list 'roundfilledbox  x y width height blotdiam)))
 
 (define (text s)
   (string-append "\\hbox{" (output-tex-string s) "}"))

diff --git a/scm/ps.scm b/scm/ps.scm
index b0f1bdb41d9275a2324275d24558913c63fcbea4..423c3326ada24ccb10afddb1cc01444cfa74e15d 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -175,10 +175,10 @@
   (string-append (numbers->string (list breapth width depth height))
                 " draw_box" ))
 
-(define (roundfilledbox x width y height blotdiam)
+(define (roundfilledbox x y width height blotdiam)
    (string-append " "
       (numbers->string
-         (list x width y height blotdiam)) " draw_round_box"))
+         (list x y width height blotdiam)) " draw_round_box"))
 
 (define (dot x y radius)
     (string-append " "

diff --git a/scm/sketch.scm b/scm/sketch.scm
index 9e784d5d8be9aa16e925c0042f8c44ad98299914..e5b2cd7a54caedfc0af8b99694289b521dee8b1f 100644 (file)
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -30,6 +30,12 @@
 ;;    ))
 
 
+;;
+;; All functions have the signature 
+;;
+;;  NAME X Y ARGUMENTS-PASSED-BY-LILYPOND
+;;
+
 ;; guile <= 1.4.x compatibility for eval
 (if (or (equal? (minor-version) "4.1")
        (equal? (minor-version) "4")
@@ -63,9 +69,6 @@
 
 (define (dispatch-x-y x y expr)
   (apply (ly-eval (car expr) this-module) (append (list x y) (cdr expr))))
-
-
-
       
 (define (ascii->string i) (make-string 1 (integer->char i)))
 
@@ -95,6 +98,10 @@
    (sketch-numbers->string (map mul-scale (list width dy dx height x y)))
    ")\n"))
 
+
+(define (roundfilledbox x y dx dy w h b)
+  (filled-rectangle w 0 0 h x y))
+
 (define (sketch-bezier x y l)
   (let* ((c0 (car (list-tail l 3)))
         (c123 (list-head l 3))
@@ -106,6 +113,7 @@
      "bc(" (sketch-numbers->string (map mul-scale control)) ",2)\n")))
   
 
+
 (define (sketch-beziers x y l thick)
   (let* ((first (list-tail l 4))
         (second (list-head l 4)))