From: Carl Sorensen <c_sorensen@byu.edu>
Date: Mon, 6 Dec 2010 23:52:57 +0000 (-0700)
Subject: Tablature -- add head-offset to TabNoteHead 'details
X-Git-Tag: release/2.13.42-1~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=142d414654d3ca1ea6217998b51a30504937c4ab;p=lilypond.git

Tablature -- add head-offset to TabNoteHead 'details

  Add a new element to details for TabNoteHead
  Adjust the value of head-offset to 3/5.
---

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 82636f3288..9666d63030 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1940,20 +1940,21 @@
 
     (TabNoteHead
      . (
-	(details . ((tied-properties . ((break-visibility . ,begin-of-line-visible)
-					(parenthesize . #t)))
-		    (repeat-tied-properties . ((note-head-visible . #t)
-					       (parenthesize . #t)))
+	(details . ((cautionary-properties . ((angularity . 0.4)
+					      (half-thickness . 0.075)
+					      (padding . 0)
+					      (procedure . ,parenthesize-stencil)
+					      (width . 0.25)))
+		    (head-offset . 3/5)
 		    (harmonic-properties . ((angularity . 2)
 					    (half-thickness . 0.075)
 					    (padding . 0)
 					    (procedure . ,parenthesize-stencil)
 					    (width . 0.25)))
-		    (cautionary-properties . ((angularity . 0.4)
-					      (half-thickness . 0.075)
-					      (padding . 0)
-					      (procedure . ,parenthesize-stencil)
-					      (width . 0.25)))))
+		    (repeat-tied-properties . ((note-head-visible . #t)
+					       (parenthesize . #t)))
+		    (tied-properties . ((break-visibility . ,begin-of-line-visible)
+					(parenthesize . #t)))))
 
 	(direction . ,CENTER)
 	(duration-log . ,note-head::calc-duration-log)
diff --git a/scm/tablature.scm b/scm/tablature.scm
index 83ad8bdf31..7865b9bff5 100644
--- a/scm/tablature.scm
+++ b/scm/tablature.scm
@@ -273,10 +273,12 @@
 	 (cautionary-width (assoc-get 'width cautionary-props 0.25))
          (output-grob (ly:text-interface::print grob))
 	 (ref-grob (grob-interpret-markup grob "8"))
-	 (column-offset (interval-length
-			    (ly:stencil-extent
-			      (grob-interpret-markup grob "8")
-			      X))))
+	 (offset-factor (assoc-get 'head-offset details 3/5))
+	 (column-offset (* offset-factor
+			   (interval-length
+			     (ly:stencil-extent
+			       (grob-interpret-markup grob "8")
+			       X)))))
 
     (if (is-harmonic? grob)
         (set! output-grob (harmonic-proc output-grob