Run scripts/auxiliar/update-with-convert-ly.sh

[lilypond.git] / Documentation / notation / fretted-strings.itely

diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely
index 1ce12cd7061bafec97a80f6213913da3e70e9b74..3e0a52ae4017b565715353c7fa374c054b054077 100644 (file)
--- a/Documentation/notation/fretted-strings.itely
+++ b/Documentation/notation/fretted-strings.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.19.21"
+@c \version "2.19.28"
 
 @node Fretted string instruments
 @section Fretted string instruments
@@ -1022,12 +1022,14 @@ capo will be the lowest fret in the fret diagram.
 Fingering indication dots can be colored as well as parenthesized;
 the parenthesis's color can also be altered independently.
 
+Markups can be placed into the dots as well.
+
 @c \override is necessary to make fingering visible
 @lilypond[quote, verbatim]
 <<
     \new ChordNames {
       \chordmode {
-        f1 g c c
+        f1 g c c b
       }
     }
   \new Staff {
@@ -1063,7 +1065,7 @@ the parenthesis's color can also be altered independently.
         (place-fret 2 5 3)
       )
     }
-    \override Voice.TextScript.size = 1.5
+    \override Voice.TextScript.size = 1.4
     <c g c' e' g'>1^\markup {
       \fret-diagram-verbose #'(
         (place-fret 6 3 1 red parenthesized default-paren-color)
@@ -1074,6 +1076,24 @@ the parenthesis's color can also be altered independently.
         (place-fret 1 3 1 inverted)
       )
     }
+    \override Voice.TextScript.size = 1.5
+    <b, fis b dis' fis'>1^\markup {
+      \override #'(fret-diagram-details . ((finger-code . in-dot)))
+      \fret-diagram-verbose #`(
+        (place-fret 5 2 1)
+        (place-fret 4 4 "fis" red)
+        (place-fret 3 4 "b" red)
+        (place-fret
+          2 4
+          ,#{ \markup
+                \concat {
+                  \vcenter "d"
+                  \fontsize #-5
+                  \musicglyph #"accidentals.sharp"} #}
+          red)
+        (place-fret 1 2 1)
+      )
+    }
   }
 >>
 @end lilypond
@@ -1823,11 +1843,11 @@ constructs:
 ChordsAndSymbols = {
   \chordmode {
     \powerChords
-    e,,1:1.5
-    a,,1:1.5.8
+    e,,1:5
+    a,,1:5.8
     \set minimumFret = #8
-    c,1:1.5
-    f,1:1.5.8
+    c,1:5
+    f,1:5.8
   }
   \set minimumFret = #5
   <a, e>1
@@ -1856,8 +1876,8 @@ other common chord modifier is used:
 mixedChords = \chordmode {
   c,1
   \powerChords
-  b,,1:1.5
-  fis,,1:1.5.8
+  b,,1:5
+  fis,,1:5.8
   g,,1:m
 }
 \score {