CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/05/12 11:08:00
Modified files:
. : ChangeLog
Documentation/user: advanced-notation.itely
Log message:
Clarify Text section.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3599&tr2=1.3600&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/advanced-notation.itely.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3599 lilypond/ChangeLog:1.3600
--- lilypond/ChangeLog:1.3599 Thu May 12 09:55:10 2005
+++ lilypond/ChangeLog Thu May 12 11:08:00 2005
@@ -1,3 +1,8 @@
+2005-05-12 Graham Percival <[EMAIL PROTECTED]>
+
+ * Documentation/user/advanced-notation.itely: edit of Text
+ section; clarify text scripts vs. text markup.
+
2005-05-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/multi-measure-rest-engraver.cc
Index: lilypond/Documentation/user/advanced-notation.itely
diff -u lilypond/Documentation/user/advanced-notation.itely:1.23
lilypond/Documentation/user/advanced-notation.itely:1.24
--- lilypond/Documentation/user/advanced-notation.itely:1.23 Wed May 11
04:37:11 2005
+++ lilypond/Documentation/user/advanced-notation.itely Thu May 12 11:08:00 2005
@@ -31,6 +31,7 @@
@menu
* Text scripts::
* Text spanners::
+* Text marks::
* Text markup::
* Text encoding::
* Nested scores::
@@ -47,8 +48,8 @@
@cindex text items, non-empty
@cindex non-empty texts
-It is possible to place arbitrary strings of text or markup text (see
[EMAIL PROTECTED] markup}) above or below notes by using a string
+It is possible to place arbitrary strings of text or
[EMAIL PROTECTED] markup} above or below notes by using a string
@code{c^"text"}. By default, these indications do not influence the
note spacing, but by using the command @code{\fatText}, the widths
will be taken into account
@@ -64,7 +65,7 @@
@end lilypond
The @code{\markup} is described in more detail in
[EMAIL PROTECTED] markup}.
[EMAIL PROTECTED] markup}.
@refcommands
@@ -118,17 +119,71 @@
Examples: @inputfileref{input/@/regression,text@/-spanner@/.ly}.
[EMAIL PROTECTED] Text marks
[EMAIL PROTECTED] Text marks
+
[EMAIL PROTECTED] coda on bar line
[EMAIL PROTECTED] segno on bar line
[EMAIL PROTECTED] fermata on bar line
[EMAIL PROTECTED] bar lines, symbols on
+
+The @code{\mark} command is primarily used for
[EMAIL PROTECTED] marks},
+but it can also be used to put signs like coda,
+segno, and fermata on a bar line. Use @code{\markup} to
+access the appropriate symbol
+
[EMAIL PROTECTED],quote,raggedright,verbatim,relative=2]
+c1 \mark \markup { \musicglyph #"scripts.ufermata" }
+c1
[EMAIL PROTECTED] lilypond
+
[EMAIL PROTECTED]
[EMAIL PROTECTED] is only typeset above the top stave of the score. If
+you specify the @code{\mark} command at a bar line, the resulting
+mark is placed above the bar line. If you specify it in the middle
+of a bar, the resulting mark is positioned between notes. If it is
+specified before the beginning of a score line, it is placed
+before the first note of the line. Finally, if the mark occurs at
+a line break, the mark will be printed at the
+beginning of the next line.
[EMAIL PROTECTED] IMO this is a bug; hopefully it'll be fixed soon, so I can
[EMAIL PROTECTED] delete this sentence. -gp
+If there is no next line, then the mark will not be printed at all.
+To print the mark at the end of the current line, use
+
[EMAIL PROTECTED]
+\override Score.RehearsalMark
+ #'break-visibility = #begin-of-line-invisible
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED] is often useful for adding text to the end of bar. In
+such cases, changing the @code{#'self-alignment} is very useful
+
[EMAIL PROTECTED],quote,raggedright,verbatim,relative=2]
+\override Score.RehearsalMark
+ #'break-visibility = #begin-of-line-invisible
+c1 c c c4 c c c
+\once \override Score.RehearsalMark #'self-alignment-X = #right
+\mark "D.S. al Fine "
[EMAIL PROTECTED] lilypond
+
+
[EMAIL PROTECTED]
+
+Program reference: @internalsref{MarkEvent}, @internalsref{RehearsalMark}.
+
+
@node Text markup
@subsection Text markup
+
[EMAIL PROTECTED] markup
@cindex text markup
@cindex markup text
-
@cindex typeset text
-The internal mechanism to typeset texts is accessed with the keyword
[EMAIL PROTECTED] Within markup mode, you can enter texts similar to
-lyrics. They are simply entered, while commands use the backslash @code{\}.
[EMAIL PROTECTED] markup
+Use @code{\markup} to typeset text. Commands are entered with the
+backslash @code{\}.
@lilypond[quote,verbatim,fragment,relative=1]
c1^\markup { hello }
@@ -136,12 +191,36 @@
c1^\markup { hi \bold there, is \italic anyone home? }
@end lilypond
[EMAIL PROTECTED]
[EMAIL PROTECTED] is primarily used for @internalsref{Text scripts},
+but it can also be used anywhere text is called in lilypond
+
[EMAIL PROTECTED],verbatim]
+\header{ title = \markup{ \bold { foo \italic { bar! } } } }
+\score{
+ \relative c'' {
+ \override Score.RehearsalMark
+ #'break-visibility = #begin-of-line-invisible
+ \override Score.RehearsalMark #'self-alignment-X = #right
+
+ \set Staff.instrument = \markup{ \column{ Alto solo } }
+ c2^\markup{ don't be \flat }
+ b2
+ a2\mark \markup{ \large \bold Fine }
+ r2
+ \bar "||"
+ }
+ \addlyrics { bar, foo \markup{ \italic bar! } }
+}
[EMAIL PROTECTED] lilypond
+
@cindex font switching
The markup in the example demonstrates font switching commands. The
command @code{\bold} and @code{\italic} apply to the first following
-word only; enclose a set of texts with braces to apply a command
-to more words:
+word only; to apply a command to more than one word, enclose the
+words with braces,
+
@example
\markup @{ \bold @{ hi there @} @}
@end example
@@ -198,6 +277,14 @@
Syntax errors for markup mode are confusing.
[EMAIL PROTECTED]
+* Text encoding::
+* Nested scores::
+* Overview of text markup commands::
+* New dynamic marks::
+* Other text markup issues::
[EMAIL PROTECTED] menu
+
@node Text encoding
@subsection Text encoding
@@ -513,7 +600,7 @@
@cindex fermata on multi-measure rest
Texts can be added to multi-measure rests by using the
[EMAIL PROTECTED]@code{markup} syntax (see @ref{Text markup}).
[EMAIL PROTECTED]@code{markup} syntax @internalsref{Text markup}.
A variable (@code{\fermataMarkup}) is provided for
adding fermatas
@@ -733,50 +820,6 @@
@code{format-mark-letters} and @code{format-mark-box-letters}.
These can be used as inspiration for other formatting functions.
-
[EMAIL PROTECTED] coda on bar line
[EMAIL PROTECTED] segno on bar line
[EMAIL PROTECTED] fermata on bar line
[EMAIL PROTECTED] bar lines, symbols on
-
-The @code{\mark} command can also be used to put signs like coda,
-segno, and fermata on a bar line. Use @code{\markup} to
-access the appropriate symbol
-
[EMAIL PROTECTED],quote,raggedright,verbatim,relative=2]
-c1 \mark \markup { \musicglyph #"scripts.ufermata" }
-c1
[EMAIL PROTECTED] lilypond
-
-If the mark occurs at a line break, the mark will be printed at the
-beginning of the next line.
[EMAIL PROTECTED] IMO this is a bug; hopefully it'll be fixed soon, so I can
[EMAIL PROTECTED] delete this sentence. -gp
-If there is no next line, then the mark will not be printed at all.
-To print the mark at the end of the current line, use
-
[EMAIL PROTECTED]
-\override Score.RehearsalMark
- #'break-visibility = #begin-of-line-invisible
[EMAIL PROTECTED] example
-
[EMAIL PROTECTED] is often useful for adding text to the end of bar. In
-such cases, changing the @code{#'self-alignment} is very useful
-
[EMAIL PROTECTED],quote,raggedright,verbatim,relative=2]
-\override Score.RehearsalMark
- #'break-visibility = #begin-of-line-invisible
-c4 c c c
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark "D.S. al Fine "
[EMAIL PROTECTED] lilypond
-
-
[EMAIL PROTECTED] fermatas
[EMAIL PROTECTED] coda
[EMAIL PROTECTED] segno
[EMAIL PROTECTED] bar lines, putting symbols on
-
@seealso
Program reference: @internalsref{MarkEvent}, @internalsref{RehearsalMark}.
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
