Merge branch 'master' of git://git.sv.gnu.org/lilypond.git

diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely
index 82b097dca4a24210893b4692a61da434ed3a05af..50d2b8119ce0bbca137f0ca60e8ad63fd684bab2 100644 (file)
--- a/Documentation/user/keyboards.itely
+++ b/Documentation/user/keyboards.itely
@@ -31,7 +31,7 @@ keyboard.
 @subsection Common notation for keyboards
 
 This section discusses notation issues that may arise for most
-many-stringed instruments.
+keyboard instruments.
 
 @menu
 * References for keyboards::
@@ -99,6 +99,10 @@ as shown in @rlearning{Other uses for tweaks}.
 
 @end itemize
 
+@c @snippets
+@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@c {forcing-visibility-of-systems-with-multi-bar-rests-when-using-\RemoveEmptyStaffContext.ly}
+@c http://lsr.dsi.unimi.it/LSR/Item?u=1&id=312
 
 @seealso
 Learning Manual:
@@ -257,8 +261,13 @@ has no effect on the pitches of the music, so if necessary, put
 If additional control is needed over the individual staves, they
 can be created manually with the names @code{"up"} and
 @code{"down"}.  The @code{\autochange} command will then switch
-its voice between the existing staves.  For example, this is
-necessary to place a key signature in the lower staff:
+its voice between the existing staves.  
+
+@warning{If staves are created manually, they @emph{must} be named
+@code{"up"} and @code{"down"}.}
+
+For example, staves must be created manually in order to place a
+key signature in the lower staff:
 
 @lilypond[quote,verbatim]
 \new PianoStaff <<
@@ -561,31 +570,40 @@ Snippets:
 @node Harp
 @subsection Harp
 
+This section discusses notation issues that are unique to the harp.
+
 @menu
-* Harp notation::
+* References for harps::
 * Harp pedals::
 @end menu
 
-@node Harp notation
-@unnumberedsubsubsec Harp notation
+@node References for harps
+@unnumberedsubsubsec References for harps
+@cindex harps
+@cindex bisbiglando
 
-TBC
+Some common characteristics of harp music are covered elsewhere:
 
-@ignore
-Some possibilities:
-- glissandi
-- tremolo (for bisbigliando)
-- natural harmonics
-- directional arpeggio and non-arpeggio
-- workaroung for keeping both staves visible in an orchestral
-  score,
-http://lists.gnu.org/archive/html/lilypond-user/2007-08/msg00386.html
-and http://lsr.dsi.unimi.it/LSR/Item?u=1&id=312
-
-An LSR snippet could be used to demonstrate the main items; in the
-case of glissandi, it would be desirable to have a demonstration
-of different styles.
-@end ignore
+@itemize
+
+@item The glissando is the most characterisic harp technique,
+@ref{Glissando}.
+
+@item A @notation{bisbigliando} is written as a tremelo @ref{Tremolo
+repeats}
+
+@item Natural harmonics are covered under @ref{Harmonics}.
+
+@item For directional arpeggios and non-arpeggios, see @ref{Arpeggio}.
+
+@end itemize
+
+@seealso
+Notation Reference:
+@ruser{Tremolo repeats}
+@ruser{Glissando}
+@ruser{Arpeggio}
+@ruser{Harmonics}
 
 @node Harp pedals
 @unnumberedsubsubsec Harp pedals
@@ -625,3 +643,4 @@ position (sharpened pitch), and @code{|} is the divider. A prefixed
 @seealso
 Notation Reference:
 @ruser{Text scripts}
+@ruser{Instrument Specific Markup}

diff --git a/input/regression/musicxml/61k-Lyrics-SpannersExtenders.xml b/input/regression/musicxml/61k-Lyrics-SpannersExtenders.xml
index 95293128d33cf5fed8d78fedf6a8626bff2d5ff5..22354d82a9b4094fdc6f6012970f6a916be31df0 100644 (file)
--- a/input/regression/musicxml/61k-Lyrics-SpannersExtenders.xml
+++ b/input/regression/musicxml/61k-Lyrics-SpannersExtenders.xml
@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Lyrics spanners: continued \r
-            syllables and extenders, possibly spanning multiple notes. The \r
-            intermediate notes do not have any &lt;lyric&gt; \r
-            element.</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <lyric justify="left" number="1">\r
-          <syllabic>single</syllabic>\r
-          <text>A</text>\r
-          <extend/>\r
-        </lyric>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <lyric number="1">\r
-          <syllabic>begin</syllabic>\r
-          <text>b</text>\r
-        </lyric>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <lyric justify="left" number="1">\r
-          <syllabic>end</syllabic>\r
-          <text>CC</text>\r
-          <extend/>\r
-        </lyric>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="3">\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <lyric justify="left" number="1">\r
-          <syllabic>single</syllabic>\r
-          <text>e</text>\r
-          <extend/>\r
-        </lyric>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <rest/>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Lyrics spanners: continued 
+            syllables and extenders, possibly spanning multiple notes. The 
+            intermediate notes do not have any &lt;lyric&gt; 
+            element.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric justify="left" number="1">
+          <syllabic>single</syllabic>
+          <text>A</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric number="1">
+          <syllabic>begin</syllabic>
+          <text>b</text>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric justify="left" number="1">
+          <syllabic>end</syllabic>
+          <text>CC</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <lyric justify="left" number="1">
+          <syllabic>single</syllabic>
+          <text>e</text>
+          <extend/>
+        </lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>