From: Neil Puttock <n.puttock@gmail.com>
Date: Sat, 10 Oct 2009 14:26:29 +0000 (+0100)
Subject: Compile fix.
X-Git-Tag: release/2.13.6-1~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f78663a73e5c8a7293f912abc3688d3c448ea361;p=lilypond.git

Compile fix.
---

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 6147b7fd8d..0832f8bca9 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -724,7 +724,7 @@ context."
                                 (beamed-minimum-free-lengths 0 0 0)
                                 (beamed-extreme-minimum-free-lengths 0 0)
                                 (stem-shorten 0 0))
-  %% after all, the stubs of thestems may still be visible, so ...
+  %% after all, the stubs of the stems may still be visible, so ...
   \override Stem #'transparent = ##t
   %% automatic beams should be suppressed for similar reasons ...
   autoBeaming = ##f
diff --git a/ly/property-init.ly b/ly/property-init.ly
index b64c8b577d..95006443f9 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -381,7 +381,7 @@ tabFullNotation = {
   \revert Stem #'details
   \revert Stem #'transparent
   \override TabVoice.Stem #'stencil = #tabvoice::draw-double-stem-for-half-notes
-  autoBeaming = ##t
+  \set autoBeaming = ##t
   \revert NoteColumn #'ignore-collision
   % beams, dots
   \revert TabVoice.Beam #'stencil
diff --git a/scm/tablature.scm b/scm/tablature.scm
index 054f3416d1..ec26113caa 100644
--- a/scm/tablature.scm
+++ b/scm/tablature.scm
@@ -33,7 +33,7 @@
   (reverse (cdr (reverse tuning))))
 
 ;; for more control over glyph-name calculations,
-;; we use a custom callback for tab noteheads
+;; we use a custom callback for tab note heads
 ;; which will ignore 'style = 'do
 (define-public (tab-note-head::calc-glyph-name grob)
   (let ((style (ly:grob-property grob 'style)))
@@ -41,7 +41,7 @@
     (case style
       ((cross) "2cross"))))
 
-;; ensure we only call notehead callback when
+;; ensure we only call note head callback when
 ;; 'style = 'cross
 (define-public (tab-note-head::whiteout-if-style-set grob)
   (let ((style (ly:grob-property grob 'style)))
@@ -176,14 +176,14 @@
                 (vector-ref (assoc-get 'break-visibility
                                        tied-properties #(#f #f #t)) 2)))
 
-              (if tab-note-head-visible
-                 ;; tab note head is visible
-                 (if tab-note-head-parenthesized
-                     (ly:grob-set-property! tied-tab-note-head 'stencil
-                                            (lambda (grob)
-                                                    (parenthesize-tab-note-head grob))))
-                 ;; tab note head is invisible
-                 (ly:grob-set-property! tied-tab-note-head 'transparent #t)))
+	  (if tab-note-head-visible
+	      ;; tab note head is visible
+	      (if tab-note-head-parenthesized
+		  (ly:grob-set-property! tied-tab-note-head 'stencil
+					 (lambda (grob)
+					   (parenthesize-tab-note-head grob))))
+	      ;; tab note head is invisible
+	      (ly:grob-set-property! tied-tab-note-head 'transparent #t)))
 
         ;; tie is not split -> make fret number invisible
         (ly:grob-set-property! tied-tab-note-head 'transparent #t))))
@@ -197,28 +197,30 @@
          (tab-note-head-visible (assoc-get 'note-head-visible repeat-tied-properties #t))
          (tab-note-head-parenthesized (assoc-get 'parenthesize repeat-tied-properties #t)))
 
-        (if tab-note-head-visible
-            ;; tab note head is visible
-            ( if tab-note-head-parenthesized
-                 (ly:grob-set-property! tied-tab-note-head 'stencil
-                                        (lambda (grob)
-                                                (parenthesize-tab-note-head grob))))
-            ;; tab note head is invisible
-            (ly:grob-set-property! tied-tab-note-head 'transparent #t))))
+    (if tab-note-head-visible
+	;; tab note head is visible
+	(if tab-note-head-parenthesized
+	    (ly:grob-set-property! tied-tab-note-head 'stencil
+				   (lambda (grob)
+				     (parenthesize-tab-note-head grob))))
+	;; tab note head is invisible
+	(ly:grob-set-property! tied-tab-note-head 'transparent #t))))
 
 ;; the slurs should not be too far apart from the corresponding fret number, so
 ;; we move the slur towards the TabNoteHeads:
-#(define-public (slur::draw-tab-slur grob)
+(define-public (slur::draw-tab-slur grob)
   ;; TODO: use a less "brute-force" method to decrease
   ;; the distance between the slur ends and the fret numbers
-  (let* ((staff-symbol (ly:grob-object grob 'staff-symbol))
-         (staff-space (ly:grob-property staff-symbol 'staff-space))
+  (let* ((staff-space (ly:staff-symbol-staff-space grob))
          (control-points (ly:grob-property grob 'control-points))
-         (new-control-points (map (lambda (p)
-                                          (cons (car p) (- (cdr p)
-                                                        (* staff-space
-                                                           (ly:grob-property grob 'direction)
-                                                           0.35))))
-                                  control-points)))
-        (ly:grob-set-property! grob 'control-points new-control-points)
-        (ly:slur::print grob)))
\ No newline at end of file
+         (new-control-points (map
+			      (lambda (p)
+				(cons (car p)
+				      (- (cdr p)
+					 (* staff-space
+					    (ly:grob-property grob 'direction)
+					    0.35))))
+			      control-points)))
+
+    (ly:grob-set-property! grob 'control-points new-control-points)
+    (ly:slur::print grob)))