CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/05/24 19:09:20
Modified files:
. : ChangeLog
Documentation/user: lilypond.tely basic-notation.itely
advanced-notation.itely
changing-defaults.itely
Log message:
Misc editing, rearranging.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3652&tr2=1.3653&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/lilypond.tely.diff?tr1=1.128&tr2=1.129&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/basic-notation.itely.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/advanced-notation.itely.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/changing-defaults.itely.diff?tr1=1.129&tr2=1.130&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3652 lilypond/ChangeLog:1.3653
--- lilypond/ChangeLog:1.3652 Mon May 23 23:23:42 2005
+++ lilypond/ChangeLog Tue May 24 19:09:19 2005
@@ -1,3 +1,14 @@
+2005-05-24 Graham Percival <[EMAIL PROTECTED]>
+
+ * Documentation/user/lilypond.tely: move changing-defaults to be
+ before global issues.
+
+ * Documentation/user/basic-notation.itely: move Transpose section
+ here from advanced/Other.
+
+ * Documentation/user/changing-defaults.itely,
+ advanced-notation.itely: move Fonts to advanced, edit.
+
2005-05-24 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/parser.yy (bare_int): remove rule. From now on, we require
Index: lilypond/Documentation/user/advanced-notation.itely
diff -u lilypond/Documentation/user/advanced-notation.itely:1.27
lilypond/Documentation/user/advanced-notation.itely:1.28
--- lilypond/Documentation/user/advanced-notation.itely:1.27 Mon May 23
19:29:14 2005
+++ lilypond/Documentation/user/advanced-notation.itely Tue May 24 19:09:20 2005
@@ -37,6 +37,8 @@
* Text encoding::
* Nested scores::
* Overview of text markup commands::
+* Selecting font sizes::
+* Font selection::
* New dynamic marks::
* Other text markup issues::
@end menu
@@ -357,6 +359,133 @@
@include markup-commands.tely
[EMAIL PROTECTED] Selecting font sizes
[EMAIL PROTECTED] Selecting font sizes
+
+The easiest method of setting the font size of any context, is by
+setting the @code{fontSize} property.
+
[EMAIL PROTECTED],fragment,relative=1,verbatim]
+c8
+\set fontSize = #-4
+c f
+\set fontSize = #3
+g
[EMAIL PROTECTED] lilypond
+
[EMAIL PROTECTED]
+It does not change the size of variable symbols, such as beams or
+slurs.
+
+Internally, the @code{fontSize} context property will cause the
[EMAIL PROTECTED] property to be set in all layout objects. The value
+of @code{font-size} is a number indicating the size relative to the
+standard size for the current staff height. Each step up is an
+increase of approximately 12% of the font size. Six steps is exactly a
+factor two. The Scheme function @code{magstep} converts a
[EMAIL PROTECTED] number to a scaling factor.
+
[EMAIL PROTECTED],fragment,relative=1,verbatim]
+c8
+\override NoteHead #'font-size = #-4
+c f
+\override NoteHead #'font-size = #3
+g
[EMAIL PROTECTED] lilypond
+
+LilyPond has fonts in different design sizes. The music fonts for
+smaller sizes are chubbier, while the text fonts are relatively wider.
+Font size changes are achieved by scaling the design size that is
+closest to the desired size. The standard font size (for
[EMAIL PROTECTED] equals 0), depends on the standard staff height. For
+a 20pt staff, a 10pt font is selected.
+
+The @code{font-size} property can only be set on layout objects that
+use fonts. These are the ones supporting the
[EMAIL PROTECTED] layout interface.
+
[EMAIL PROTECTED]
+
+The following commands set @code{fontSize} for the current voice:
+
[EMAIL PROTECTED] @code{\tiny}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\small}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\normalsize}
[EMAIL PROTECTED]
+
+
[EMAIL PROTECTED] Font selection
[EMAIL PROTECTED] Font selection
+
[EMAIL PROTECTED] font selection
[EMAIL PROTECTED] font magnification
[EMAIL PROTECTED] @code{font-interface}
+
+By setting the object properties described below, you can select a
+font from the preconfigured font families. LilyPond has default
+support for the feta music fonts and @TeX{}'s Computer Modern text
+fonts.
+
[EMAIL PROTECTED] @bullet
[EMAIL PROTECTED] @code{font-encoding}
+is a symbol that sets layout of the glyphs. This should only be set to
+select different types of non-text fonts, eg.
+
[EMAIL PROTECTED] for piano staff braces, @code{fetaMusic} the
+standard music font, including ancient glyphs, @code{fetaDynamic} for
+dynamic signs and @code{fetaNumber} for the number font.
+
[EMAIL PROTECTED] @code{font-family}
+is a symbol indicating the general class of the typeface. Supported are
[EMAIL PROTECTED] (Computer Modern), @code{sans}, and @code{typewriter}.
+
[EMAIL PROTECTED] @code{font-shape}
+is a symbol indicating the shape of the font. There are typically
+several font shapes available for each font family. Choices are
[EMAIL PROTECTED], @code{caps}, and @code{upright}.
+
[EMAIL PROTECTED] @code{font-series}
+is a symbol indicating the series of the font. There are typically
+several font series for each font family and shape. Choices are
[EMAIL PROTECTED] and @code{bold}.
+
[EMAIL PROTECTED] itemize
+
+Fonts selected in the way sketched above come from a predefined style
+sheet. If you want to use a font from outside the style sheet,
+then set the
[EMAIL PROTECTED] property,
+
[EMAIL PROTECTED],verbatim]
+{
+ \override Staff.TimeSignature #'font-name = #"Times"
+ \override Staff.TimeSignature #'font-size = #2
+ \time 3/4
+ c'1_\markup {
+ \override #'(font-name . "Vera Bold")
+ { This text is in Vera Bold }
+ }
+}
[EMAIL PROTECTED] lilypond
+
[EMAIL PROTECTED]
+Any font can be used, as long as it is available to Pango/FontConfig.
+
+The size of the font may be set with the @code{font-size}
+property. The resulting size is taken relative to the
[EMAIL PROTECTED] as defined in the @code{\paper} block.
+
[EMAIL PROTECTED] font size
[EMAIL PROTECTED] font magnification
+
[EMAIL PROTECTED]
+
+Init files: @file{ly/@/declarations@/-init@/.ly} contains hints how new
+fonts may be added to LilyPond.
+
+
@node New dynamic marks
@subsection New dynamic marks
@@ -402,6 +531,7 @@
@end example
+
@node Preparing parts
@section Preparing parts
@@ -1922,6 +2052,7 @@
COLORLIST
+
@node Automatic notation
@section Automatic notation
@@ -1934,7 +2065,6 @@
@menu
* Automatic accidentals::
* Setting automatic beam behavior::
-* Beam formatting::
@end menu
@node Automatic accidentals
@@ -2198,22 +2328,6 @@
>>}. If a polyphonic voice ends while an automatic beam is still
accepting notes, it is not typeset.
[EMAIL PROTECTED] Beam formatting
[EMAIL PROTECTED] Beam formatting
-
-When a beam falls in the middle of the staff, the beams point normally
-down. However, this behaviour can be altered with the
[EMAIL PROTECTED] property.
-
[EMAIL PROTECTED],raggedright,relative=2,fragment,verbatim]
-{
- b8[ b]
- \override Beam #'neutral-direction = #-1
- b[ b]
- \override Beam #'neutral-direction = #1
- b[ b]
-}
[EMAIL PROTECTED] lilypond
@node Other
@@ -2224,7 +2338,6 @@
@menu
* Time administration::
-* Transpose::
@end menu
@@ -2273,83 +2386,4 @@
@end lilypond
[EMAIL PROTECTED] Transpose
[EMAIL PROTECTED] Transpose
[EMAIL PROTECTED] Transpose
[EMAIL PROTECTED] transposition of pitches
[EMAIL PROTECTED] @code{\transpose}
-
-A music expression can be transposed with @code{\transpose}. The
-syntax is
[EMAIL PROTECTED]
-\transpose @var{from} @var{to} @var{musicexpr}
[EMAIL PROTECTED] example
-
-This means that @var{musicexpr} is transposed by the interval between
-the pitches @var{from} and @var{to}: any note with pitch @code{from}
-is changed to @code{to}.
-
-
-For example, consider a piece written in the key of D-major. If
-this piece is a little too low for its performer, it can be
-transposed up to E-major with
[EMAIL PROTECTED]
-\transpose d e @dots{}
[EMAIL PROTECTED] example
-
-Consider a part written for violin (a C instrument). If
-this part is to be played on the A clarinet, the following
-transposition will produce the appropriate part
-
[EMAIL PROTECTED]
-\transpose a c @dots{}
[EMAIL PROTECTED] example
-
[EMAIL PROTECTED] distinguishes between enharmonic pitches: both
[EMAIL PROTECTED] c cis} or @code{\transpose c des} will transpose up
-half a tone. The first version will print sharps and the second
-version will print flats
-
[EMAIL PROTECTED],raggedright,verbatim]
-mus = { \key d \major cis d fis g }
-\context Staff {
- \clef "F" \mus
- \clef "G"
- \transpose c g' \mus
- \transpose c f' \mus
-}
[EMAIL PROTECTED] lilypond
-
[EMAIL PROTECTED] may also be used to input written notes for a
-transposing instrument. Pitches are normally entered into LilyPond
-in C (or ``concert pitch''), but they may be entered in another
-key. For example, when entering music for a B-flat trumpet which
-begins on concert D, one would write
-
[EMAIL PROTECTED]
-\transpose c bes @{ e4 @dots{} @}
[EMAIL PROTECTED] example
-
-To print this music in B-flat again (ie producing a trumpet part,
-instead of a concert pitch conductor's score) you would wrap the
-existing music with another @code{transpose}
-
[EMAIL PROTECTED]
-\transpose bes c @{ \transpose c bes @{ e4 @dots{} @} @}
[EMAIL PROTECTED] example
-
-
-
[EMAIL PROTECTED]
-
-Program reference: @internalsref{TransposedMusic}, and
[EMAIL PROTECTED]
-
[EMAIL PROTECTED]
-
-If you want to use both @code{\transpose} and @code{\relative},
-you must put @code{\transpose} outside of @code{\relative}, since
[EMAIL PROTECTED] will have no effect music that appears inside a
[EMAIL PROTECTED]
-
Index: lilypond/Documentation/user/basic-notation.itely
diff -u lilypond/Documentation/user/basic-notation.itely:1.19
lilypond/Documentation/user/basic-notation.itely:1.20
--- lilypond/Documentation/user/basic-notation.itely:1.19 Fri May 20
10:08:28 2005
+++ lilypond/Documentation/user/basic-notation.itely Tue May 24 19:09:20 2005
@@ -13,7 +13,7 @@
@menu
* Note entry::
-* Easier music entry::
+* Alternate music entry::
* Staff notation::
* Connecting notes::
* Expressive marks::
@@ -472,8 +472,8 @@
[EMAIL PROTECTED] Easier music entry
[EMAIL PROTECTED] Easier music entry
[EMAIL PROTECTED] Alternate music entry
[EMAIL PROTECTED] Alternate music entry
@cindex Music entry
This section deals with tricks and features of the input language that
@@ -488,6 +488,7 @@
@menu
* Relative octaves::
* Octave check::
+* Transpose::
* Bar check::
* Skipping corrected music::
* Automatic note splitting::
@@ -626,6 +627,86 @@
@end lilypond
[EMAIL PROTECTED] Transpose
[EMAIL PROTECTED] Transpose
+
[EMAIL PROTECTED] Transpose
[EMAIL PROTECTED] transposition of pitches
[EMAIL PROTECTED] @code{\transpose}
+
+A music expression can be transposed with @code{\transpose}. The
+syntax is
[EMAIL PROTECTED]
+\transpose @var{from} @var{to} @var{musicexpr}
[EMAIL PROTECTED] example
+
+This means that @var{musicexpr} is transposed by the interval between
+the pitches @var{from} and @var{to}: any note with pitch @code{from}
+is changed to @code{to}.
+
+For example, consider a piece written in the key of D-major. If
+this piece is a little too low for its performer, it can be
+transposed up to E-major with
[EMAIL PROTECTED]
+\transpose d e @dots{}
[EMAIL PROTECTED] example
+
+Consider a part written for violin (a C instrument). If
+this part is to be played on the A clarinet, the following
+transposition will produce the appropriate part
+
[EMAIL PROTECTED]
+\transpose a c @dots{}
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED] distinguishes between enharmonic pitches: both
[EMAIL PROTECTED] c cis} or @code{\transpose c des} will transpose up
+half a tone. The first version will print sharps and the second
+version will print flats
+
[EMAIL PROTECTED],raggedright,verbatim]
+mus = { \key d \major cis d fis g }
+\context Staff {
+ \clef "F" \mus
+ \clef "G"
+ \transpose c g' \mus
+ \transpose c f' \mus
+}
[EMAIL PROTECTED] lilypond
+
[EMAIL PROTECTED] may also be used to input written notes for a
+transposing instrument. Pitches are normally entered into LilyPond
+in C (or ``concert pitch''), but they may be entered in another
+key. For example, when entering music for a B-flat trumpet which
+begins on concert D, one would write
+
[EMAIL PROTECTED]
+\transpose c bes @{ e4 @dots{} @}
[EMAIL PROTECTED] example
+
+To print this music in B-flat again (ie producing a trumpet part,
+instead of a concert pitch conductor's score) you would wrap the
+existing music with another @code{transpose}
+
[EMAIL PROTECTED]
+\transpose bes c @{ \transpose c bes @{ e4 @dots{} @} @}
[EMAIL PROTECTED] example
+
+
[EMAIL PROTECTED]
+
+Program reference: @internalsref{TransposedMusic}, and
[EMAIL PROTECTED]
+
+
[EMAIL PROTECTED]
+
+If you want to use both @code{\transpose} and @code{\relative},
+you must put @code{\transpose} outside of @code{\relative}, since
[EMAIL PROTECTED] will have no effect music that appears inside a
[EMAIL PROTECTED]
+
+
@node Bar check
@subsection Bar check
Index: lilypond/Documentation/user/changing-defaults.itely
diff -u lilypond/Documentation/user/changing-defaults.itely:1.129
lilypond/Documentation/user/changing-defaults.itely:1.130
--- lilypond/Documentation/user/changing-defaults.itely:1.129 Wed May 18
04:36:41 2005
+++ lilypond/Documentation/user/changing-defaults.itely Tue May 24 19:09:20 2005
@@ -60,7 +60,6 @@
@menu
* Interpretation contexts::
* The \override command::
-* Fonts::
@end menu
@@ -1321,156 +1320,3 @@
is one. For example, if using this with @code{Slur},
@code{Slur::after_line_breaking} should also be called.
[EMAIL PROTECTED] Fonts
[EMAIL PROTECTED] Fonts
-
-This section details the ways that the font can be changed.
-
[EMAIL PROTECTED]
-* Selecting font sizes::
-* Font selection::
[EMAIL PROTECTED] menu
-
-
-
[EMAIL PROTECTED] Selecting font sizes
[EMAIL PROTECTED] Selecting font sizes
-
-
-The easiest method of setting the font size of any context, is by
-setting the @code{fontSize} property.
-
[EMAIL PROTECTED],fragment,relative=1,verbatim]
-c8
-\set fontSize = #-4
-c f
-\set fontSize = #3
-g
[EMAIL PROTECTED] lilypond
-
[EMAIL PROTECTED]
-It does not change the size of variable symbols, such as beams or
-slurs.
-
-Internally, the @code{fontSize} context property will cause the
[EMAIL PROTECTED] property to be set in all layout objects. The value
-of @code{font-size} is a number indicating the size relative to the
-standard size for the current staff height. Each step up is an
-increase of approximately 12% of the font size. Six steps is exactly a
-factor two. The Scheme function @code{magstep} converts a
[EMAIL PROTECTED] number to a scaling factor.
-
[EMAIL PROTECTED],fragment,relative=1,verbatim]
-c8
-\override NoteHead #'font-size = #-4
-c f
-\override NoteHead #'font-size = #3
-g
[EMAIL PROTECTED] lilypond
-
-LilyPond has fonts in different design sizes. The music fonts for
-smaller sizes are chubbier, while the text fonts are relatively wider.
-Font size changes are achieved by scaling the design size that is
-closest to the desired size. The standard font size (for
[EMAIL PROTECTED] equals 0), depends on the standard staff height. For
-a 20pt staff, a 10pt font is selected.
-
-The @code{font-size} property can only be set on layout objects that
-use fonts. These are the ones supporting the
[EMAIL PROTECTED] layout interface.
-
[EMAIL PROTECTED]
-
-The following commands set @code{fontSize} for the current voice:
-
[EMAIL PROTECTED] @code{\tiny}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\small}
[EMAIL PROTECTED],
[EMAIL PROTECTED] @code{\normalsize}
[EMAIL PROTECTED]
-
-
-
[EMAIL PROTECTED] magnification
[EMAIL PROTECTED] cue notes
-
-
[EMAIL PROTECTED] Font selection
[EMAIL PROTECTED] Font selection
-
-
-
[EMAIL PROTECTED] font selection
[EMAIL PROTECTED] font magnification
[EMAIL PROTECTED] @code{font-interface}
-
-By setting the object properties described below, you can select a
-font from the preconfigured font families. LilyPond has default
-support for the feta music fonts and @TeX{}'s Computer Modern text
-fonts.
-
-
[EMAIL PROTECTED] @bullet
[EMAIL PROTECTED] @code{font-encoding}
-is a symbol that sets layout of the glyphs. This should only be set to
-select different types of non-text fonts, eg.
-
[EMAIL PROTECTED] for piano staff braces, @code{fetaMusic} the
-standard music font, including ancient glyphs, @code{fetaDynamic} for
-dynamic signs and @code{fetaNumber} for the number font.
-
[EMAIL PROTECTED] @code{font-family}
-is a symbol indicating the general class of the typeface. Supported are
[EMAIL PROTECTED] (Computer Modern), @code{sans}, and @code{typewriter}.
-
[EMAIL PROTECTED] @code{font-shape}
-is a symbol indicating the shape of the font. There are typically
-several font shapes available for each font family. Choices are
[EMAIL PROTECTED], @code{caps}, and @code{upright}.
-
[EMAIL PROTECTED] @code{font-series}
-is a symbol indicating the series of the font. There are typically
-several font series for each font family and shape. Choices are
[EMAIL PROTECTED] and @code{bold}.
-
[EMAIL PROTECTED] itemize
-
-Fonts selected in the way sketched above come from a predefined style
-sheet. If you want to use a font from outside the style sheet,
-then set the
[EMAIL PROTECTED] property,
-
[EMAIL PROTECTED],verbatim]
-{
- \override Staff.TimeSignature #'font-name = #"Times"
- \override Staff.TimeSignature #'font-size = #2
- \time 3/4
- c'1_\markup {
- \override #'(font-name . "Vera Bold")
- { This text is in Vera Bold }
- }
-}
[EMAIL PROTECTED] lilypond
-
[EMAIL PROTECTED]
-Any font can be used, as long as it is available to Pango/FontConfig.
-
-The size of the font may be set with the @code{font-size}
-property. The resulting size is taken relative to the
[EMAIL PROTECTED] as defined in the @code{\paper} block.
-
-
[EMAIL PROTECTED] font size
[EMAIL PROTECTED] font magnification
-
-
-
[EMAIL PROTECTED]
-
-Init files: @file{ly/@/declarations@/-init@/.ly} contains hints how new
-fonts may be added to LilyPond.
-
-
-
-
Index: lilypond/Documentation/user/lilypond.tely
diff -u lilypond/Documentation/user/lilypond.tely:1.128
lilypond/Documentation/user/lilypond.tely:1.129
--- lilypond/Documentation/user/lilypond.tely:1.128 Tue May 24 16:10:09 2005
+++ lilypond/Documentation/user/lilypond.tely Tue May 24 19:09:20 2005
@@ -260,9 +260,9 @@
* Instrument-specific notation:: Notation that is only used for some
instruments.
* Advanced notation:: Less frequently used notation.
+* Changing defaults:: Tuning output.
* Global issues:: Non-notation commands.
-* Changing defaults:: Tuning output.
* Interfaces for programmers::
* LilyPond-book:: Integrating text and music.
* Converting from other formats:: Converting to lilypond source format.
@@ -289,9 +289,9 @@
@include basic-notation.itely
@include instrument-notation.itely
@include advanced-notation.itely
[EMAIL PROTECTED] changing-defaults.itely
@include global.itely
[EMAIL PROTECTED] changing-defaults.itely
@include programming-interface.itely
@include lilypond-book.itely
@include converters.itely
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
