Doc: 989 - Fretted string orientations to NR

fret-diagrams-origin.ly -> added snippet to D/S/N and to NR
Tidied up lilypond examples as per CG for itely file

diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely
index 0b6aa7e9642adbebca4724bd09c0110410824822..598acba667404758b9310d7fb05edabcba56a78d 100644 (file)
--- a/Documentation/notation/fretted-strings.itely
+++ b/Documentation/notation/fretted-strings.itely
@@ -165,7 +165,7 @@ calligraphic tablature clef is added automatically.
 @lilypond[quote,ragged-right,verbatim]
 \new TabStaff \relative c' {
   a,8 a' <c e> a
-  d, a' <d f> a
+  d,8 a' <d f> a
 }
 @end lilypond
 
@@ -178,14 +178,14 @@ symbols = {
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default
-  c8_.\<\( c16 c ~ c2\!
+  c8_.\<\( c16 c~ c2\!
   c'2.\prall\)
 }
 
 \score {
   <<
     \new Staff { \clef "G_8" \symbols }
-    \new TabStaff   { \symbols }
+    \new TabStaff { \symbols }
   >>
 }
 @end lilypond
@@ -204,7 +204,7 @@ symbols = {
   c4-.^"Allegro" d( e)
   f4-.\f g a^\fermata
   \mark \default
-  c8_.\<\( c16 c ~ c2\!
+  c8_.\<\( c16 c~ c2\!
   c'2.\prall\)
 }
 
@@ -260,7 +260,7 @@ chord constructs so repeated chords get identical tablature representations.
 \tabChordRepetition
 
 guitar = \relative c' {
-  r8 < gis\4 cis\3 b\2 > ~ q4 q8 ~ q q4
+  r8 <gis\4 cis\3 b\2>~ q4 q8~ q q4
 }
 
 \new StaffGroup <<
@@ -298,11 +298,11 @@ ties = \relative c' {
 \score {
   <<
     \new StaffGroup  <<
-    \context Staff  {
+      \context Staff {
         \clef "treble_8"
         \ties
-    }
-      \context TabStaff  {
+      }
+      \context TabStaff {
         \ties
       }
     >>
@@ -337,11 +337,11 @@ ties = \relative c' {
 \score {
   <<
     \new StaffGroup  <<
-    \context Staff  {
+      \context Staff {
         \clef "treble_8"
         \ties
-    }
-      \context TabStaff  {
+      }
+      \context TabStaff {
       \hideSplitTiedTabNotes
         \ties
       }
@@ -365,7 +365,7 @@ notation.
 @lilypond[verbatim, quote, relative=1]
 \new TabStaff {
   \new TabVoice {
-    <c g'\harmonic> d\2\glissando e\2
+    <c g'\harmonic>4 d\2\glissando e\2
   }
 }
 @end lilypond
@@ -404,7 +404,7 @@ In order to handle @code{\partcombine}, a @code{TabStaff} must use
 specially-created voices:
 
 @lilypond[quote,ragged-right,verbatim]
-melodia = \partcombine { e4 g g g }{ e4 e e e }
+melodia = \partcombine { e4 g g g } { e4 e e e }
 <<
   \new TabStaff <<
     \new TabVoice = "one" s1
@@ -566,16 +566,18 @@ In addition, open and unplayed (muted) strings can be indicated.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       c1 d:m
-     }
+    \chordmode {
+      c1 d:m
+    }
   }
   \context Staff {
     \clef "treble_8"
-    < c e g c' e' > 1 ^\markup
+    <c e g c' e'>1^\markup {
       \fret-diagram #"6-x;5-3;4-2;3-o;2-1;1-o;"
-    < d a d' f'> ^\markup
+    }
+    <d a d' f'>1^\markup {
       \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-1;"
+    }
   }
 >>
 @end lilypond
@@ -594,10 +596,12 @@ the fret-diagram markup string.
   }
   \context Staff {
     \clef "treble_8"
-    < f, c f a c' f'>1 ^\markup
+    <f, c f a c' f'>1^\markup {
       \fret-diagram #"c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"
-    < g, d g b d' g'> ^\markup
+    }
+    <g, d g b d' g'>1^\markup {
       \fret-diagram #"c:6-1-3;6-3;5-5;4-5;3-4;2-3;1-3;"
+    }
   }
 >>
 @end lilypond
@@ -620,10 +624,12 @@ can be changed in the fret-diagram markup string.
   }
   \context Staff {
     \clef "treble_8"
-    < f, c f a c' f'>1 ^\markup
+    <f, c f a c' f'>1^\markup {
       \fret-diagram #"s:1.5;c:6-1-1;6-1;5-3;4-3;3-2;2-1;1-1;"
-    < g, b, d g b g'> ^\markup
+    }
+    <g, b, d g b g'>1^\markup {
       \fret-diagram #"h:6;6-3;5-2;4-o;3-o;2-o;1-3;"
+    }
   }
 >>
 @end lilypond
@@ -635,13 +641,15 @@ markup string.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       a1
-     }
+    \chordmode {
+      a1
+    }
   }
   \context Staff {
-        %% An A chord for ukulele
-    a'1 ^\markup \fret-diagram #"w:4;4-2-2;3-1-1;2-o;1-o;"
+    % An 'A' chord for ukulele
+    a'1^\markup {
+      \fret-diagram #"w:4;4-2-2;3-1-1;2-o;1-o;"
+    }
   }
 >>
 @end lilypond
@@ -652,16 +660,18 @@ can be controlled by the fret-diagram markup string.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       c1 d:m
-     }
+    \chordmode {
+      c1 d:m
+    }
   }
   \context Staff {
     \clef "treble_8"
-    < c e g c' e' > 1 ^\markup
+    <c e g c' e'>1^\markup {
       \fret-diagram #"f:1;6-x;5-3-3;4-2-2;3-o;2-1-1;1-o;"
-    < d a d' f'> ^\markup
+    }
+    <d a d' f'>1^\markup {
       \fret-diagram #"f:2;6-x;5-x;4-o;3-2-2;2-3-3;1-1-1;"
+    }
   }
 >>
 @end lilypond
@@ -672,16 +682,18 @@ markup string.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       c1 d:m
-     }
+    \chordmode {
+      c1 d:m
+    }
   }
   \context Staff {
     \clef "treble_8"
-    < c e g c' e' > 1 ^\markup
+    <c e g c' e'>1^\markup {
       \fret-diagram #"d:0.35;6-x;5-3;4-2;3-o;2-1;1-o;"
-    < d a d' f'> ^\markup
+    }
+    <d a d' f'>1^\markup {
       \fret-diagram #"p:0.2;6-x;5-x;4-o;3-2;2-3;1-1;"
+    }
   }
 >>
 @end lilypond
@@ -700,16 +712,18 @@ Mute strings, open strings, and fret numbers can be indicated.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       c1 d:m
-     }
+    \chordmode {
+      c1 d:m
+    }
   }
   \context Staff {
     \clef "treble_8"
-    < c e g c' e' > 1 ^\markup
+    <c e g c' e'>1^\markup {
       \fret-diagram-terse #"x;3;2;o;1;o;"
-    < d a d' f'> ^\markup
+    }
+    <d a d' f'>1^\markup {
       \fret-diagram-terse #"x;x;o;2;3;1;"
+    }
   }
 >>
 @end lilypond
@@ -719,16 +733,18 @@ Barre indicators can be included in the fret-diagram-terse markup string.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       f1 g
-     }
+    \chordmode {
+      f1 g
+    }
   }
   \context Staff {
     \clef "treble_8"
-    < f, c f a c' f'>1 ^\markup
+    <f, c f a c' f'>1^\markup {
       \fret-diagram-terse #"1-(;3;3;2;1;1-);"
-    < g, d g b d' g'> ^\markup
+    }
+    <g, d g b d' g'>1^\markup {
       \fret-diagram-terse #"3-(;5;5;4;3;3-);"
+    }
   }
 >>
 @end lilypond
@@ -739,18 +755,20 @@ Fingering indications can be included in the fret-diagram-terse markup string.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       c1 d:m
-     }
+    \chordmode {
+      c1 d:m
+    }
   }
   \context Staff {
     \override Voice.TextScript
       #'(fret-diagram-details finger-code) = #'below-string
     \clef "treble_8"
-    < c e g c' e' > 1 ^\markup
+    <c e g c' e'>1^\markup {
       \fret-diagram-terse #"x;3-3;2-2;o;1-1;o;"
-    < d a d' f'> ^\markup
+    }
+    <d a d' f'>1^\markup {
       \fret-diagram-terse #"x;x;o;2-2;3-3;1-1;"
+    }
   }
 >>
 @end lilypond
@@ -768,14 +786,15 @@ The fret-diagram-verbose markup string is in the format of a Scheme list.  Each
 element of the list indicates an item to be placed on the fret diagram.
 
 @lilypond[quote, verbatim]
-<<  \context ChordNames {
-     \chordmode {
-       c1 d:m
-     }
-  }
+<<
+    \context ChordNames {
+      \chordmode {
+        c1 d:m
+      }
+    }
   \context Staff {
     \clef "treble_8"
-    < c e g c' e' > 1 ^\markup
+    <c e g c' e'>1^\markup {
       \fret-diagram-verbose #'(
         (mute 6)
         (place-fret 5 3)
@@ -784,7 +803,8 @@ element of the list indicates an item to be placed on the fret diagram.
         (place-fret 2 1)
         (open 1)
       )
-    < d a d' f'> ^\markup
+    }
+    <d a d' f'>1^\markup {
       \fret-diagram-verbose #'(
         (mute 6)
         (mute 5)
@@ -793,6 +813,7 @@ element of the list indicates an item to be placed on the fret diagram.
         (place-fret 2 3)
         (place-fret 1 1)
       )
+    }
   }
 >>
 @end lilypond
@@ -807,17 +828,16 @@ capo will be the lowest fret in the fret diagram.
 @c \override is necessary to make fingering visible
 @lilypond[quote, verbatim]
 <<
-  \context ChordNames {
-     \chordmode {
-       f1 g c
-     }
-  }
+    \context ChordNames {
+      \chordmode {
+        f1 g c
+      }
+    }
   \context Staff {
     \clef "treble_8"
     \override Voice.TextScript
       #'(fret-diagram-details finger-code) = #'below-string
-
-    < f, c f a c' f'>1 ^\markup
+    <f, c f a c' f'>1^\markup {
       \fret-diagram-verbose #'(
         (place-fret 6 1)
         (place-fret 5 3)
@@ -827,7 +847,8 @@ capo will be the lowest fret in the fret diagram.
         (place-fret 1 1)
         (barre 6 1 1)
       )
-    < g, b, d g b g'> ^\markup
+    }
+    <g, b, d g b g'>1^\markup {
       \fret-diagram-verbose #'(
         (place-fret 6 3 2)
         (place-fret 5 2 1)
@@ -836,7 +857,8 @@ capo will be the lowest fret in the fret diagram.
         (open 2)
         (place-fret 1 3 3)
       )
-    < c e g c' e'> ^\markup
+    }
+    <c e g c' e'>1^\markup {
       \fret-diagram-verbose #'(
         (capo 3)
         (mute 6)
@@ -844,7 +866,8 @@ capo will be the lowest fret in the fret diagram.
         (place-fret 3 5 2)
         (place-fret 2 5 3)
       )
-   }
+    }
+  }
 >>
 @end lilypond
 
@@ -862,27 +885,33 @@ and color of dots.
 @lilypond[verbatim,ragged-right,quote]
 \new Voice {
   \clef "treble_8"
-  d^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
-  d d d
-  fis^\markup \override #'(size . 0.75) {
-    \override #'(finger-code . below-string) {
-      \fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2)
-                               (place-fret 5 4 3)
-                               (place-fret 4 4 4)
-                               (place-fret 3 3 2)
-                               (place-fret 2 2 1)
-                               (place-fret 1 2 1))
+  d4^\markup {
+    \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
+  }
+  d4 d d
+  fis^\markup {
+    \override #'(size . 0.75) {
+      \override #'(finger-code . below-string) {
+        \fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2)
+                                 (place-fret 5 4 3)
+                                 (place-fret 4 4 4)
+                                 (place-fret 3 3 2)
+                                 (place-fret 2 2 1)
+                                 (place-fret 1 2 1))
+      }
     }
   }
-  fis fis fis
-  c^\markup \override #'(dot-radius . 0.35) {
-    \override #'(finger-code . in-dot) {
-      \override #'(dot-color . white) {
-        \fret-diagram-terse #"x;3-1-(;5-2;5-3;5-4;3-1-);"
+  fis4 fis fis
+  c^\markup {
+    \override #'(dot-radius . 0.35) {
+      \override #'(finger-code . in-dot) {
+        \override #'(dot-color . white) {
+          \fret-diagram-terse #"x;3-1-(;5-2;5-3;5-4;3-1-);"
+        }
       }
     }
   }
-  c c c
+  c4 c c
 }
 @end lilypond
 @end ignore
@@ -901,8 +930,10 @@ markup, the interface properties belong to @code{Voice.TextScript}.
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{customizing-markup-fret-diagrams.ly}
+{changing-fret-orientations.ly}
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{customizing-markup-fret-diagrams.ly}
 
 @seealso
 Notation Reference:
@@ -974,7 +1005,7 @@ either as simultaneous music or using chord mode (see
 @lilypond[verbatim, ragged-right,quote]
 \include "predefined-guitar-fretboards.ly"
 \context FretBoards {
-  \chordmode {c1}
+  \chordmode { c1 }
   <c' e' g'>1
 }
 @end lilypond
@@ -1021,7 +1052,7 @@ mychords = \chordmode{
 
 mychordlist = {
   \mychords
-  \transpose c e { \mychords}
+  \transpose c e { \mychords }
 }
 <<
   \context ChordNames {
@@ -1075,11 +1106,11 @@ marking list.
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"
 
-\storePredefinedDiagram \chordmode {c:maj9}
+\storePredefinedDiagram \chordmode { c:maj9 }
                         #guitar-tuning
                         #"x;3-2;o;o;o;o;"
 
-mychords = \chordmode{
+mychords = \chordmode {
   c1 c:maj9
 }
 
@@ -1101,11 +1132,11 @@ default octave are used for transposing fretboards.
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"
 
-\storePredefinedDiagram \chordmode {c''}
+\storePredefinedDiagram \chordmode { c'' }
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'bes guitar-tuning))
 
-mychords = \chordmode{
+mychords = \chordmode {
   c1 c''
 }
 
@@ -1140,16 +1171,16 @@ marking lists.
 @lilypond[verbatim, ragged-right, quote]
 \include "predefined-guitar-fretboards.ly"
 
-% add a new chord shape
+% Add a new chord shape
 
 \addChordShape #'powerf #guitar-tuning #"1-1;3-3;3-4;x;x;x;"
 
 % add some new chords based on the power chord shape
 
-\storePredefinedDiagram \chordmode {f''}
+\storePredefinedDiagram \chordmode { f'' }
                         #guitar-tuning
                         #(chord-shape 'powerf guitar-tuning)
-\storePredefinedDiagram \chordmode {g''}
+\storePredefinedDiagram \chordmode { g'' }
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'powerf guitar-tuning))
 
@@ -1219,18 +1250,18 @@ calculates strings and frets that can be used to play the notes.
 @lilypond[quote,ragged-right,verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       f1 g
-     }
+    \chordmode {
+      f1 g
+    }
   }
   \context FretBoards {
-    < f, c f a c' f'>1
-    < g,\6 b, d g b g'>
+    <f, c f a c' f'>1
+    <g,\6 b, d g b g'>1
   }
   \context Staff {
     \clef "treble_8"
-    < f, c f a c' f'>1
-    < g, b, d g b' g'>
+    <f, c f a c' f'>1
+    <g, b, d g b' g'>1
   }
 >>
 @end lilypond
@@ -1252,22 +1283,22 @@ commands:
                         #"x;3-1-(;5-2;5-3;5-4;3-1-1);"
 <<
   \context ChordNames {
-     \chordmode {
-       c1 c c
-     }
+    \chordmode {
+      c1 c c
+    }
   }
   \context FretBoards {
     <c e g c' e'>1
     \predefinedFretboardsOff
-    <c e g c' e'>
+    <c e g c' e'>1
     \predefinedFretboardsOn
-    <c e g c' e'>
+    <c e g c' e'>1
   }
   \context Staff {
     \clef "treble_8"
     <c e g c' e'>1
-    <c e g c' e'>
-    <c e g c' e'>
+    <c e g c' e'>1
+    <c e g c' e'>1
   }
 >>
 @end lilypond
@@ -1289,18 +1320,18 @@ Fingerings can be added to FretBoard fret diagrams.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       c1 d:m
-     }
+    \chordmode {
+      c1 d:m
+    }
   }
   \context FretBoards {
-    < c-3 e-2 g c'-1 e' > 1
-    < d a-2 d'-3 f'-1>
+    <c-3 e-2 g c'-1 e'>1
+    <d a-2 d'-3 f'-1>1
   }
   \context Staff {
     \clef "treble_8"
-    < c e g c' e' > 1
-    < d a d' f'>
+    <c e g c' e'>1
+    <d a d' f'>1
   }
 >>
 @end lilypond
@@ -1312,19 +1343,19 @@ property.
 @lilypond[quote, verbatim]
 <<
   \context ChordNames {
-     \chordmode {
-       d1:m d:m
-     }
+    \chordmode {
+      d1:m d:m
+    }
   }
   \context FretBoards {
-    < d a d' f'>
+    <d a d' f'>1
     \set FretBoards.minimumFret = #5
-    < d a d' f'>
+    <d a d' f'>1
   }
   \context Staff {
     \clef "treble_8"
-    < d a d' f'>
-    < d a d' f'>
+    <d a d' f'>1
+    <d a d' f'>1
   }
 >>
 @end lilypond

diff --git a/Documentation/snippets/changing-fret-orientations.ly b/Documentation/snippets/changing-fret-orientations.ly
new file mode 100644 (file)
index 0000000..12884ac
--- /dev/null
+++ b/Documentation/snippets/changing-fret-orientations.ly
@@ -0,0 +1,41 @@
+% Do not edit this file; it is automatically
+% generated from Documentation/snippets/new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.27
+\version "2.13.29"
+
+\header {
+  lsrtags = "fretted-strings"
+
+  texidoc = "Fret diagrams can be oriented in three ways.  By default
++the top string or fret in the different orientations will be aligned.
+"
+  doctitle = "Changing fret orientations"
+} % begin verbatim
+
+
+\include "predefined-guitar-fretboards.ly"
+\layout { ragged-right = ##t }
+<<
+  \chords {
+    c1
+    c1
+    c1
+  }
+  \new FretBoards {
+    \chordmode {
+    c1
+    \override FretBoard #'fret-diagram-details
+       #'orientation = #'landscape
+    c1
+    \override FretBoard #'fret-diagram-details
+       #'orientation = #'opposing-landscape
+    c1
+    }
+  }
+  \new Voice {
+    c'1
+    c'1
+    c'
+  }
+>>

diff --git a/Documentation/snippets/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list
index 28202de031549b8fd0add62272508dab2c4218f3..fe91aa1482d8d4d7f4af2c8105b95d06a07742b2 100644 (file)
--- a/Documentation/snippets/fretted-strings.snippet-list
+++ b/Documentation/snippets/fretted-strings.snippet-list
@@ -2,6 +2,7 @@ adding-fingerings-to-a-score.ly
 adding-fingerings-to-tablatures.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
 bar-chords-notation-for-guitar--with-text-spanner.ly
+changing-fret-orientations.ly
 chordchanges-for-fretboards.ly
 controlling-the-placement-of-chord-fingerings.ly
 customizing-fretboard-fret-diagrams.ly

diff --git a/Documentation/snippets/new/changing-fret-orientations.ly b/Documentation/snippets/new/changing-fret-orientations.ly
new file mode 100644 (file)
index 0000000..1b16dee
--- /dev/null
+++ b/Documentation/snippets/new/changing-fret-orientations.ly
@@ -0,0 +1,36 @@
+\version "2.13.27"
+
+\header {
+  lsrtags = "fretted-strings"
+
+  texidoc = "Fret diagrams can be oriented in three ways.  By default
++the top string or fret in the different orientations will be aligned.
+"
+  doctitle = "Changing fret orientations"
+}
+
+\include "predefined-guitar-fretboards.ly"
+\layout { ragged-right = ##t }
+<<
+  \chords {
+    c1
+    c1
+    c1
+  }
+  \new FretBoards {
+    \chordmode {
+    c1
+    \override FretBoard #'fret-diagram-details
+       #'orientation = #'landscape
+    c1
+    \override FretBoard #'fret-diagram-details
+       #'orientation = #'opposing-landscape
+    c1
+    }
+  }
+  \new Voice {
+    c'1
+    c'1
+    c'
+  }
+>>