Web: Add color to bach-schenker.ly - issue 1018

Added colors to various parts of the schenker example.
Added comments in .ly file to see where specific edits were made to
the original .ly file
Added Line in ../web/introduction.itexi commenting on the addition of color

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index 7e7925ff20e998af32f9eeba127f1763365e1835..6f6cf9476b298ed24e8214c07b0dc841308aa3cf 100644 (file)
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -287,7 +287,8 @@ staff.
 
 Standard output can be modified heavily. Here is an impressive
 Schenkerian analysis, created by Kris Schaffer, for an article
-in @uref{http://www.linuxjournal.com/article/8364 , Linux Journal}
+in @uref{http://www.linuxjournal.com/article/8364 , Linux Journal.}.
+The colors have been added for better visibility.
 
 @exampleImage{bach-schenker}
 @newsEnd

diff --git a/Documentation/web/ly-examples/bach-schenker.ly b/Documentation/web/ly-examples/bach-schenker.ly
index 1b5ff7ae406722194489a6f4383789db9471e5db..657bf7c137e6ab5852aa9e2a0d1674b30f31710c 100644 (file)
--- a/Documentation/web/ly-examples/bach-schenker.ly
+++ b/Documentation/web/ly-examples/bach-schenker.ly
@@ -10,6 +10,9 @@
 
 % See http://kris.shaffermusic.com/tech.html. for more information
 
+% 'Add color...' sections are not the original author's, but added
+% afterwards specifically for illustration in LilyPond's Documentation.
+
 I = \once \override NoteColumn #'ignore-collision = ##t
 
 \version "2.12.0"
@@ -31,15 +34,18 @@ staffPiano = \new PianoStaff {
            \override NoteHead #'duration-log = #1
            s1 b8[^\markup {
              \override #'(baseline-skip . 0.5)
-             \column { \small { ^ 3 } }
+              % Add color to markup in top staff
+              \column { \with-color #red \small { ^ 3 } }
            }
            s4. s1 a8^\markup {
              \override #'(baseline-skip . 0.5)
-             \column { \small { ^ 2 } }
+              % Add color to markup in top staff
+              \column { \with-color #red \small { ^ 2 } }
            }
            s4. s2 g8]^\markup {
+              % Add color to markup in top staff
              \override #'(baseline-skip . 0.5)
-             \column { \small { ^ 1 } }
+             \column { \with-color #red \small { ^ 1 } }
            }
            s4.
            \revert Beam #'positions
@@ -48,6 +54,8 @@ staffPiano = \new PianoStaff {
          }
        \\
          {
+            % Add color to both Dashed Slurs in top staff
+            \override Slur #'color = #(x11-color "purple")
            \override Stem #'transparent = ##t
            s1
            \once \override Slur #'height-limit = #6
@@ -81,11 +89,15 @@ staffPiano = \new PianoStaff {
          }
        \\
          {
+            % Add color to all remaining Slurs in top staff
+            \override Slur #'color = #(x11-color "violet")
+            \override PhrasingSlur #'color = #(x11-color "violet")
            \override Stem #'transparent = ##t
            \override Stem #'length = #0
-           g4_\( fis^(_\markup { \tiny N } g)\)
-           a^(^\markup { \tiny P } b2)
-           b4^(^\markup { \tiny P }
+            % Add color to text markups in top staff
+           g4_\( fis^(_\markup { \with-color #blue \tiny N } g)\)
+           a^(^\markup { \with-color #blue \tiny P } b2)
+           b4^(^\markup { \with-color #blue \tiny P }
            \stemUp
            \revert Stem #'transparent
            \override Stem #'length = #10
@@ -95,7 +107,8 @@ staffPiano = \new PianoStaff {
            \override Stem #'length = #0
            \override Stem #'transparent = ##t
            \once \override Slur #'extra-offset = #'(0 . 0.35)
-           c4^\( b_(_\markup { \tiny P } a)\) s2
+            % Add color to remaining text markup in top staff
+           c4^\( b_(_\markup { \with-color #blue \tiny P } a)\) s2
            \revert Stem #'length
          }
        \\
@@ -139,9 +152,13 @@ staffPiano = \new PianoStaff {
            \override Beam #'positions = #'(-8 . -8)
            \override NoteHead #'transparent = ##t
            \stemDown
-           \I g8[_\markup { \bold I } s4. s1 s s2
-           \I d8_\markup { \bold V } s4.
-           \I g,8]_\markup { \bold I } s4.
+            % Add color to long beam text markups in bottom staff
+           \I g8[_\markup { \with-color #(x11-color 'LawnGreen) \bold I }
+            s4. s1 s s2
+           \I d8_\markup { \with-color #(x11-color 'LawnGreen) \bold V }
+            s4.
+           \I g,8]_\markup { \with-color #(x11-color 'LawnGreen) \bold I }
+            s4.
            \revert Beam #'positions
            \revert NoteHead #'transparent
          }
@@ -155,16 +172,20 @@ staffPiano = \new PianoStaff {
          }
        \\
          {
+            % Add color to all single-note Slurs in bottom staff
+            \override Slur #'color = #(x11-color "violet")
            \override Stem #'transparent = ##t
            \once \override NoteHead #'transparent = ##t
            \override Stem #'length = #0
            g'4
            \once \override TextScript #'padding = #0.25
-           a4_(^\markup { \tiny P } b)
-           fis4^(^\markup { \tiny P } e)
+            % Add color to text markups in bottom staff
+           a4_(^\markup { \with-color #blue \tiny P } b)
+           fis4^(^\markup { \with-color #blue \tiny P } e)
            \once \override NoteHead #'transparent = ##t
            \once \override Slur #'height-limit = #1.5
-           c4^( d)^\markup { \tiny N }
+            % Add color to remaining text markup in bottom staff
+           c4^( d)^\markup { \with-color #blue \tiny N }
            \once \override NoteHead #'transparent = ##t
            \once \override Slur #'extra-offset = #'(0 . 0.5)
            \I fis,4_(
@@ -182,6 +203,8 @@ staffPiano = \new PianoStaff {
          }
        \\
          {
+            % Add color to all two-note Slurs in bottom staff
+            \override Slur #'color = #(x11-color "violet")
            \override Stem #'transparent = ##t
            \override NoteHead #'transparent = ##t
            \I g'4^( s b) s2
@@ -203,6 +226,8 @@ staffPiano = \new PianoStaff {
          }
        \\
          {
+            % Add color to four-note Slur in bottom staff
+            \override Slur #'color = #(x11-color "violet")
            \override Stem #'transparent = ##t
            \override NoteHead #'transparent = ##t
            \override Stem #'length = #0
@@ -215,6 +240,8 @@ staffPiano = \new PianoStaff {
          }
        \\
          {
+            % Add color to dashed Slur in bottom staff
+            \override Slur #'color = #(x11-color "purple")
            \override Stem #'transparent = ##t
            \override NoteHead #'transparent = ##t
            \slurDashed