Doc: NR Tidy up of A4 - fretboard diagrams

Removed bar numbers - inappropriate for this section

Added an @appendixsubsec for each of the three pre-defined
fretboard instruments (Guitar, Ukulele and Mandolin) so as
to make it easier to find in the index but also to break up
the apparent 'wall' of fretboard diagrams when viewing the
Appendix.

(cherry picked from commit 442a4b8c3b4d4890292556703aa125d8de92b2d6)

diff --git a/Documentation/included/display-predefined-fretboards.ly b/Documentation/included/display-predefined-fretboards.ly
index 3e4e7fc3b52d8f8ef14ad4327e78d195fbebd5d4..639797324e6283d0a717daea8308bbbc89bc2dde 100644 (file)
--- a/Documentation/included/display-predefined-fretboards.ly
+++ b/Documentation/included/display-predefined-fretboards.ly
@@ -2,7 +2,9 @@
 \version "2.16.0"
 
 
-mychords = \chordmode {c1 c:m c:aug c:dim c:dim7 c:7 c:maj7 c:m7 c:9 \break }
+mychords = \chordmode {
+  c1 c:m c:aug c:dim c:dim7 c:7 c:maj7 c:m7 c:9 \break
+}
 
 chordsline = {
   \mychords
@@ -18,7 +20,7 @@ chordsline = {
   \transpose c dis {
     \mychords
   }
- \transpose c ees {
+  \transpose c ees {
     \mychords
   }
   \transpose c e {
@@ -64,8 +66,11 @@ chordsline = {
     \new FretBoards {
       \chordsline
     }
-    \new Staff {
-      \chordsline
-    }
   >>
+  \layout {
+    \context {
+      \Score
+      \remove "Bar_number_engraver"
+    }
+  }
 }

diff --git a/Documentation/included/display-predefined-mandolin-fretboards.ly b/Documentation/included/display-predefined-mandolin-fretboards.ly
index 683c35e26ad38005cc87e7e2b04bc2a2b11e597b..f8a0f86240b4a2dd0110184fb2b1be75cfef934f 100644 (file)
--- a/Documentation/included/display-predefined-mandolin-fretboards.ly
+++ b/Documentation/included/display-predefined-mandolin-fretboards.ly
@@ -3,8 +3,7 @@
 
 
 mychords = \chordmode {
-  c1 c:m c:aug c:dim7 c:7 c:maj7 c:m7 c:m7.5-
-  c:6 c:sus2 c:sus4 c:9
+  c1 c:m c:aug c:dim7 c:7 c:maj7 c:m7 c:m7.5- c:6 c:sus2 c:sus4 c:9
   \break
 }
 
@@ -22,7 +21,7 @@ chordsline = {
   \transpose c dis {
     \mychords
   }
- \transpose c ees {
+  \transpose c ees {
     \mychords
   }
   \transpose c e {
@@ -60,15 +59,20 @@ chordsline = {
   }
 }
 
-<<
-  \new ChordNames {
-    \chordsline
+\score {
+  <<
+    \new ChordNames {
+      \chordsline
+    }
+    \new FretBoards {
+      \set Staff.stringTunings = #mandolin-tuning
+      \chordsline
+    }
+  >>
+  \layout {
+    \context {
+      \Score
+      \remove "Bar_number_engraver"
+    }
   }
-  \new FretBoards {
-    \set Staff.stringTunings = #mandolin-tuning
-    \chordsline
-  }
-  \new Staff {
-    \chordsline
-  }
->>
+}

diff --git a/Documentation/included/display-predefined-ukulele-fretboards.ly b/Documentation/included/display-predefined-ukulele-fretboards.ly
index fab326d8008d67d3a0e9730c435303e2487141ee..f72a5115581e338b95be0d5c953acefe8f13ef86 100644 (file)
--- a/Documentation/included/display-predefined-ukulele-fretboards.ly
+++ b/Documentation/included/display-predefined-ukulele-fretboards.ly
@@ -3,9 +3,7 @@
 
 
 mychords = \chordmode {
-  c1 c:m c:aug c:dim c:7 c:maj7 c:m7
-  c:6 c:sus2 c:sus4 c:9
-  \break
+  c1 c:m c:aug c:dim c:7 c:maj7 c:m7 c:6 c:sus2 c:sus4 c:9 \break
 }
 
 chordsline = {
@@ -22,7 +20,7 @@ chordsline = {
   \transpose c dis {
     \mychords
   }
- \transpose c ees {
+  \transpose c ees {
     \mychords
   }
   \transpose c e {
@@ -60,15 +58,20 @@ chordsline = {
   }
 }
 
-<<
-  \new ChordNames {
-    \chordsline
+\score {
+  <<
+    \new ChordNames {
+      \chordsline
+    }
+    \new FretBoards {
+      \set Staff.stringTunings = #ukulele-tuning
+      \chordsline
+    }
+  >>
+  \layout {
+    \context {
+      \Score
+      \remove "Bar_number_engraver"
+    }
   }
-  \new FretBoards {
-    \set Staff.stringTunings = #ukulele-tuning
-    \chordsline
-  }
-  \new Staff {
-    \chordsline
-  }
->>
+}

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index 75c12d4e4d28f3ac06784ea8e5287b7322a8cea7..5bc7c81948a55205fcb5f5d6ac255b01b3bdf1ef 100644 (file)
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -431,15 +431,24 @@ The chart below shows the predefined string tunings.
 @node Predefined fretboard diagrams
 @appendixsec Predefined fretboard diagrams
 
-The chart below shows the predefined fretboard diagrams for guitar.
+@menu
+* Diagrams for Guitar::
+* Diagrams for Ukulele::
+* Diagrams for Mandolin::
+@end menu
+
+@node Diagrams for Guitar
+@unnumberedsubsec Diagrams for Guitar
 
 @lilypondfile[line-width=15.5\cm]{display-predefined-fretboards.ly}
 
-The chart below shows the predefined fretboard diagrams for ukulele.
+@node Diagrams for Ukulele
+@unnumberedsubsec Diagrams for Ukulele
 
 @lilypondfile[line-width=15.5\cm]{display-predefined-ukulele-fretboards.ly}
 
-The chart below shows the predefined fretboard diagrams for mandolin.
+@node Diagrams for Mandolin
+@unnumberedsubsec Diagrams for Mandolin
 
 @lilypondfile[line-width=15.5\cm]{display-predefined-mandolin-fretboards.ly}