Add some lost `relative'

ly-options.

diff --git a/ChangeLog b/ChangeLog
index bf1559661bff8b7679f11e0e17f842faca99ea83..3bc9fe4746fda72b4e2e80b41feeedb744dc9303 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-02-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scripts/lilypond-book.py (compose_ly): Add kludge for relative.
+
        * Documentation/user/refman.itely: Run texinfo-all-menus-update
        (fixes make web).
 

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 4ed041f12ca50ab94de421974e1d5fc312099e70..d3eb2c11e50d0f3ebd3d3ce00eb68da3764f34c2 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -87,11 +87,7 @@ c d e f g a b
 @noindent
 then the result looks like this:
 
-@c ?
-@c \transpose c c' { c d e f g a b }
-@c @lily pond[notime]
-@c \property Score.timing = ##f
-@lilypond[notime,relative=2]
+@lilypond[notime,relative]
 c d e f g a b
 @end lilypond
 

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 4e43277a6dda7e31d1c269b2e74e8f7d7d9e95b8..759173122eb31b840e58e388f98b0b3702aa835b 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -1,4 +1,3 @@
-
 ;;; tex.scm -- implement Scheme output routines for TeX
 ;;;
 ;;;  source file of the GNU LilyPond music typesetter
@@ -67,20 +66,24 @@
 
     (if (eq? c #f)
        (begin
-         (display "FAILED\n")
-         (display (object-type (car name-mag-pair)))
-         (display (object-type (caaar font-name-alist)))
-
          (ly:warn (string-append
                    "Programming error: No such font known "
                    (car name-mag-pair) " "
-                   (ly:number->string (cdr name-mag-pair))
-                   ))
-         "") ; issue no command
-       (string-append "\\" (cddr c)))
-    
-    
-    ))
+                   (ly:number->string (cdr name-mag-pair))))
+         
+         (display "FAILED\n" (current-error-port))
+         (if #f ;(pair? name-mag-pair))
+             (display (object-type (car name-mag-pair)) (current-error-port))
+             (write name-mag-pair (current-error-port)))
+         (if #f ;  (pair? font-name-alist)
+             (display
+              (object-type (caaar font-name-alist)) (current-error-port))
+             (write font-name-alist (current-error-port)))
+
+         ;; (format #f "\n%FAILED: (select-font ~S)\n" name-mag-pair))
+         "")
+       
+       (string-append "\\" (cddr c)))))
 
 (define (blank)
   "")