From 3eb826a74e3aeacd9ca63ad50da64c1215985a2a Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sat, 31 Jul 2004 21:13:08 +0000
Subject: [PATCH] * Documentation/user/notation.itely (Formatting cue notes):
new section.
* input/test/clef-end-of-line.ly: fold into manual.
* input/test/clef-8-syntax.ly: remove.
* input/test/clef-manual-control.ly: move into manual.
* Documentation/user/notation.itely (Aligning to cadenzas): fold
in cadenza-skip.ly
* Documentation/user/notation.itely (Educational use): new section
---
ChangeLog | 7 ++
Documentation/user/notation.itely | 121 +++++++++++++++++++++++++++++-
input/test/clef-8-syntax.ly | 21 ------
input/test/clef-end-of-line.ly | 34 ---------
input/test/clef-manual-control.ly | 32 --------
input/test/cue-notes.ly | 40 ----------
6 files changed, 126 insertions(+), 129 deletions(-)
delete mode 100644 input/test/clef-8-syntax.ly
delete mode 100644 input/test/clef-end-of-line.ly
delete mode 100644 input/test/clef-manual-control.ly
diff --git a/ChangeLog b/ChangeLog
index 292db0a4b7..f6cef7fa6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,18 @@
2004-07-31 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * Documentation/user/notation.itely (Formatting cue notes): new
+ section.
+
+ * input/test/clef-end-of-line.ly: fold into manual.
+
* input/test/chords-without-melody.ly: fold into manual.
* input/test/cadenza-skip.ly: remove.
* input/test/clef-8-syntax.ly: remove.
+ * input/test/clef-manual-control.ly: move into manual.
+
* Documentation/user/notation.itely (Aligning to cadenzas): fold
in cadenza-skip.ly
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index c2b3d655a5..b1f4dd7703 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -27,6 +27,7 @@ somewhat familiar with LilyPond.
* Tablatures::
* Chord names::
* Orchestral music::
+* Formatting cue notes::
* Ancient notation::
* Contemporary notation::
* Educational use::
@@ -785,6 +786,7 @@ such as keys, clefs and time signatures.
* Partial measures::
* Unmetered music::
* Bar lines::
+* Controlling formatting of prefatory matter::
@end menu
@node Staff symbol
@@ -938,11 +940,32 @@ example,
This command is equivalent to setting @code{clefGlyph},
@code{clefPosition} (which controls the Y position of the clef),
@code{centralCPosition} and @code{clefOctavation}. A clef is printed
-when any of these properties are changed.
+when any of these properties are changed. The following example shows
+possibilities when setting properties manually.
+
+@lilypond[verbatim]
+{
+ \set Staff.clefGlyph = #"clefs-F"
+ \set Staff.clefPosition = #2
+ c'4
+ \set Staff.clefGlyph = #"clefs-G"
+ c'4
+ \set Staff.clefGlyph = #"clefs-C"
+ c'4
+ \set Staff.clefOctavation = #7
+ c'4
+ \set Staff.clefOctavation = #0
+ \set Staff.clefPosition = #0
+ c'4
+ \clef "bass"
+ c'4
+}
+@end lilypond
+
@seealso
-Program reference: the object for this symbol is @internalsref{Clef}.
+Program reference: @internalsref{Clef}.
@@ -1206,6 +1229,40 @@ in every context, and that type is determined by the property
Examples: @inputfileref{input/test,bar-lines.ly},
+@node Controlling formatting of prefatory matter
+@subsection Controlling formatting of prefatory matter
+
+TODO
+
+@lilypond[verbatim]
+\transpose c c' {
+ \override Staff.Clef #'break-visibility = #end-of-line-visible
+ \override Staff.KeySignature #'break-visibility = #end-of-line-visible
+ \set Staff.explicitClefVisibility = #end-of-line-visible
+ \set Staff.explicitKeySignatureVisibility = #end-of-line-visible
+
+ % We want the time sig to take space, otherwise there is not
+ % enough white at the start of the line.
+ %
+
+ \override Staff.TimeSignature #'transparent = ##t
+ \set Score.defaultBarType = #"empty"
+
+ c1 d e f g a b c
+ \key d \major
+ \break
+
+ % see above.
+ \time 4/4
+
+ d e fis g a b cis d
+ \key g \major
+ \break
+ \time 4/4
+}
+@end lilypond
+
+
@node Polyphony
@section Polyphony
@cindex polyphony
@@ -4172,6 +4229,7 @@ some common problems in orchestral music.
@menu
* Multiple staff contexts::
+* Aligning to cadenzas::
* Rehearsal marks::
* Bar numbers::
* Instrument names::
@@ -4836,6 +4894,65 @@ Examples: @inputfileref{input/regression,quote.ly}
Program reference: @internalsref{QuoteMusic}.
+@node Formatting cue notes
+@section Formatting cue notes
+
+
+The previous section deals with inserting notes from another
+voice. When making a part, there is also the part of formatting those
+notes. Here is an example of formatted cue notes
+
+@lilypond[verbatim]
+smaller = {
+ \set fontSize = #-1
+ \override Stem #'length = #5.5
+ \override Beam #'thickness = #0.384
+ \override Beam #'space-function =
+ #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult)))
+}
+
+{
+ \set Staff.instrument = #"Horn in F"
+ \set Score.skipBars = ##t
+ R1*21
+ << {
+ \once \override Staff.MultiMeasureRest #'staff-position = #-6
+ R1
+ }
+ \new Voice {
+ s2
+ \clef tenor
+ \smaller
+ r8^"Bsn." c'8 f'8[ f'8]
+ \clef treble
+ }
+ >>
+ c'8^"Horn" cis'
+ eis'4 fis'4
+}
+@end lilypond
+
+
+There are a couple of points to take care of:
+
+@itemize @bullet
+@item
+The multi rest of the original part should be moved up or down during
+the cue.
+@item
+Cue notes have smaller font sizes.
+@item
+When cued notes have a clef change relative to the original part, the
+clef should be restored after the cue section. This minimizes
+confusion for the reader,
+@item
+When the original part starts, this should be marked with the name of
+the instrument, in this case ``Horn.'' Of course, the cue part is
+marked with the instrument playing the cue.
+@end itemize
+
+
+
@node Ancient notation
@section Ancient notation
diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly
deleted file mode 100644
index cf1a70a763..0000000000
--- a/input/test/clef-8-syntax.ly
+++ /dev/null
@@ -1,21 +0,0 @@
-
-\version "2.3.8"
-\header {
- texidoc = "@cindex Chord Octavation
-Appending @code{_8} or @code{^8} to a clef name will
-add an octavation sign to the clef; then the clef name
-is given in quotes (such as \"treble^8\").
-" }
-
-\score {
- \context Voice \relative c {
- \clef "bass_8" c4 c c c |
- \clef "treble^8" c'''4 c c c |
- }
- \paper {
- raggedright = ##t
- }
- \midi { }
-}
-
-
diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly
deleted file mode 100644
index 6056708df1..0000000000
--- a/input/test/clef-end-of-line.ly
+++ /dev/null
@@ -1,34 +0,0 @@
-\version "2.3.8"
-\header {
-
- texidoc = "@cindex Clef End of Line
-In these scales, the clef and key signature are shown at the end of the line.
-" }
-
-\score {
- \transpose c c' {
- \override Staff.Clef #'break-visibility = #end-of-line-visible
- \override Staff.KeySignature #'break-visibility = #end-of-line-visible
- \set Staff.explicitClefVisibility = #end-of-line-visible
- \set Staff.explicitKeySignatureVisibility = #end-of-line-visible
-
- % We want the time sig to take space, otherwise there is not
- % enough white at the start of the line.
- %
-
- \override Staff.TimeSignature #'transparent = ##t
- \set Score.defaultBarType = #"empty"
-
- c1 d e f g a b c
- \key d \major
- \break
-
- % see above.
- \time 4/4
-
- d e fis g a b cis d
- \key g \major
- \break
- \time 4/4
-} }
-
diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly
deleted file mode 100644
index a18dfe1b5d..0000000000
--- a/input/test/clef-manual-control.ly
+++ /dev/null
@@ -1,32 +0,0 @@
-\version "2.3.8"
-\header{ texidoc = "
-
-@cindex Clef Manual Control
-
-The positioning of glyph and note can be separated. @code{\clef} is
-a front-end, which keeps them together. All the notes in this example
-are central C."
-
-}
-
-\score { {
- \set Staff.clefGlyph = #"clefs-F"
- \set Staff.clefPosition = #2
- c'4
- \set Staff.clefGlyph = #"clefs-G"
- c'4
- \set Staff.clefGlyph = #"clefs-C"
-
- c'4
- \set Staff.clefOctavation = #7
- c'4
- \set Staff.clefOctavation = #0
- \set Staff.clefPosition = #0
- c'4
- \clef "bass"
- c'4
-
-}
- \paper{ raggedright = ##t }
-}
-
diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly
index a4d3d3769e..28137d39ad 100644
--- a/input/test/cue-notes.ly
+++ b/input/test/cue-notes.ly
@@ -6,43 +6,3 @@ Cue notes are typeset in a smaller font. "
% Cue clefs are usually not restored explicitly. "
}
-
-\score {
-
- {
- \set Staff.instrument = #"Horn in F"
- \set Score.skipBars = ##t
- R1*21
- <<
- {
- \once \override Staff.MultiMeasureRest #'staff-position = #-6
- R1
- }
- \new Voice { s2
- \clef tenor
-
- %% this should probably be put into an identifier.
- \set Staff.fontSize = #-1
- \override Stem #'length = #5.5
- \override Beam #'thickness = #0.384
- \override Beam #'space-function =
- #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult)))
-
- r8^"Bsn." c'8 f'8[ f'8]
-
-% note: the clef should be cancelled from the cue.
-% this is under debate; I don't think it should. - Graham
-
-% if you want to cancel it in the main part, uncomment the following:
-% \set Staff.Clef = \turnOff
-
- \unset Staff.fontSize
-
- \clef treble
- } >>
- c'8^"Horn" cis'
- \unset Staff.Clef
- eis'4 fis'4
- }
- \paper { raggedright = ##t}
-}
--
2.39.5