NR 1.2.1.d: Split note more appropriately (issue 5027)

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

diff --git a/Documentation/notation/unfretted-strings.itely b/Documentation/notation/unfretted-strings.itely
index 76bf1ceb79d09e318bf161de142087d270181dd4..f3eae557659034137a17fca8574dcec93dda7bd3 100644 (file)
--- a/Documentation/notation/unfretted-strings.itely
+++ b/Documentation/notation/unfretted-strings.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.14.0"
+@c \version "2.18.0"

 
 @node Unfretted string instruments
 @section Unfretted string instruments
 
 @node Unfretted string instruments
 @section Unfretted string instruments


@@ -60,15 +60,14 @@ in @ref{Fingering instructions}.
 see @ref{Chorded notes}.  Directives for playing chords may be
 added, see @ref{Arpeggio}.
 
 see @ref{Chorded notes}.  Directives for playing chords may be
 added, see @ref{Arpeggio}.
 

-@item A template for a string quartet can be found in
-@rlearning{String quartet}.  Others are shown in the snippets.
+@item Templates for string quartets can be found in
+@rlearning{String quartet templates}.  Others are shown in the snippets.

 
 @end itemize
 
 
 @end itemize
 

-

 @seealso
 Learning Manual:
 @seealso
 Learning Manual:

-@rlearning{String quartet}.
+@rlearning{String quartet templates}.

 
 Notation Reference:
 @ref{Text scripts},
 
 Notation Reference:
 @ref{Text scripts},


@@ -86,12 +85,14 @@ Snippets:
 @funindex \upbow
 @funindex \downbow
 @funindex \open
 @funindex \upbow
 @funindex \downbow
 @funindex \open

+@funindex \romanStringNumbers

 
 @cindex bowing indications
 @cindex up bow indication
 @cindex down bow indication
 @cindex open string indication
 @cindex string, indicating open
 
 @cindex bowing indications
 @cindex up bow indication
 @cindex down bow indication
 @cindex open string indication
 @cindex string, indicating open

+@cindex string numbers

 
 Bowing indications are created as articulations, which are
 described in @ref{Articulations and ornamentations}.
 
 Bowing indications are created as articulations, which are
 described in @ref{Articulations and ornamentations}.


@@ -99,31 +100,39 @@ described in @ref{Articulations and ornamentations}.
 The bowing commands, @code{\upbow} and @code{\downbow}, are used
 with slurs as follows:
 
 The bowing commands, @code{\upbow} and @code{\downbow}, are used
 with slurs as follows:
 

-@lilypond[verbatim,quote,relative=2]
-c4(\downbow d) e(\upbow f)
+@lilypond[verbatim,quote]
+\relative { c''4(\downbow d) e(\upbow f) }

 @end lilypond
 
 @noindent
 @end lilypond
 
 @noindent

-and the following example shows three ways in which an open A
-string on a violin might be indicated:

 
 

-@lilypond[verbatim,quote,relative=2]
-a4 \open
-a^\markup { \teeny "II" }
-a2^\markup { \small "sul A" }
+Roman numerals can be added as strings numbers (rather
+than the default circled Arabic numbers), as explained in
+@ref{String number indications}.
+
+Alternatively, string indications may be printed using
+markup commands; articulation scripts may also indicate
+open strings.
+
+@lilypond[verbatim,quote,fragment]
+a'4 \open
+\romanStringNumbers
+a'\2
+a'2^\markup { \small "sul A" }

 @end lilypond
 
 
 @predefined
 @code{\downbow},
 @code{\upbow},
 @end lilypond
 
 
 @predefined
 @code{\downbow},
 @code{\upbow},

-@code{\open}.
+@code{\open},
+@code{\romanStringNumbers}.

 @endpredefined
 
 @endpredefined
 

-

 @seealso
 Notation Reference:
 @ref{Articulations and ornamentations},
 @seealso
 Notation Reference:
 @ref{Articulations and ornamentations},

+@ref{String number indications},

 @ref{Slurs}.
 
 
 @ref{Slurs}.
 
 


@@ -145,21 +154,23 @@ Natural harmonics can be notated in several ways.  A diamond-shaped
 note head generally means to touch the string where you would stop
 the note if it were not a diamond.
 
 note head generally means to touch the string where you would stop
 the note if it were not a diamond.
 

-@lilypond[verbatim,quote,relative=2]
-d4 e4.
-\harmonicsOn
-d8 e e
-d4 e4.
-\harmonicsOff
-d8 e e
+@lilypond[verbatim,quote]
+\relative d'' {
+  d4 e4.
+  \harmonicsOn
+  d8 e e
+  d4 e4.
+  \harmonicsOff
+  d8 e e
+}

 @end lilypond
 
 Alternatively a normal note head is shown at the pitch to be
 sounded together with a small circle to indicate it should be
 played as a harmonic:
 
 @end lilypond
 
 Alternatively a normal note head is shown at the pitch to be
 sounded together with a small circle to indicate it should be
 played as a harmonic:
 

-@lilypond[verbatim,quote,relative=2]
-d2^\flageolet d_\flageolet
+@lilypond[verbatim,quote,fragment]
+d''2^\flageolet d''_\flageolet

 @end lilypond
 
 A smaller circle may be created, see the snippet list in
 @end lilypond
 
 A smaller circle may be created, see the snippet list in


@@ -179,17 +190,14 @@ Artificial harmonics indicated with @code{\harmonic} do not show the
 dots.  The context property @code{harmonicDots} should be set if
 dots are required.
 
 dots.  The context property @code{harmonicDots} should be set if
 dots are required.
 

-@lilypond[verbatim,quote,relative=1]
-<e a\harmonic>2.  <c g'\harmonic>4
-\set harmonicDots = ##t
-<e a\harmonic>2.  <c g'\harmonic>4
+@lilypond[verbatim,quote]
+\relative e' {
+  <e a\harmonic>2.  <c g'\harmonic>4
+  \set harmonicDots = ##t
+  <e a\harmonic>2.  <c g'\harmonic>4
+}

 @end lilypond
 
 @end lilypond
 

-@warning{@code{@bs{}harmonic} @strong{must} be placed inside a
-chord construct even if there is only a single note.  Normally
-@code{@bs{}harmonicsOn} would be used in this situation.}
-
-

 @seealso
 Music Glossary:
 @rglos{harmonics}.
 @seealso
 Music Glossary:
 @rglos{harmonics}.


@@ -211,11 +219,13 @@ A @notation{snap pizzicato} (also known as @qq{Bartok pizz}) is a
 type of pizzicato where the string is deliberately plucked upwards
 (rather than sideways) such that it hits the fingerboard.
 
 type of pizzicato where the string is deliberately plucked upwards
 (rather than sideways) such that it hits the fingerboard.
 

-@lilypond[verbatim,quote,relative=1]
-c4\snappizzicato
-<c' e g>4\snappizzicato
-<c' e g>4^\snappizzicato
-<c, e g>4_\snappizzicato
+@lilypond[verbatim,quote]
+\relative {
+  c'4\snappizzicato
+  <c' e g>4\snappizzicato
+  <c' e g>4^\snappizzicato
+  <c, e g>4_\snappizzicato
+}

 @end lilypond
 
 
 @end lilypond