Moved section.

diff --git a/ChangeLog b/ChangeLog
index bf72fc7f090edffbe9c915b81b6882b310865fed..e7520b7b4bd9084dcd6ce5e631f4b8ea5676978b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
        * ly/titling.ly: checks printfirstpagenumber, adds meter, and
        fixes baseline-skip.  Thanks Vincent!
 
+       * Documentation/user/advanced-notation.itely, global.itely:
+       moved "Selecting font sizes" to global, since it deals with
+       notation font size, not text fonts.
+
 2005-06-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * buildscripts/gen-emmentaler-scripts.py (notice): add GPL notice

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 70b7071309262c95f4ee68311e6acb75ba092b18..cd6516ba7645da634713514bcfa06c290884bb3c 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -36,7 +36,6 @@ your scores.
 * Text encoding::               
 * Nested scores::               
 * Overview of text markup commands::  
-* Selecting font sizes::        
 * Font selection::              
 * New dynamic marks::           
 * Other text markup issues::    
@@ -132,7 +131,7 @@ Examples: @inputfileref{input/@/regression,text@/-spanner@/.ly}.
 @cindex @code{\mark}
 
 The @code{\mark} command is primarily used for
-@internalsref{Rehearsal marks},
+@ref{Rehearsal 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
@@ -388,63 +387,6 @@ The following commands can all be used inside @code{\markup @{ @}}.
 @include markup-commands.tely
 
 
-@node Selecting font sizes
-@subsection Selecting font sizes
-
-The easiest method of setting the font size of any context, is by
-setting the @code{fontSize} property.
-
-@lilypond[quote,fragment,relative=1,verbatim]
-c8
-\set fontSize = #-4
-c f
-\set fontSize = #3
-g
-@end lilypond
-
-@noindent
-It does not change the size of variable symbols, such as beams or
-slurs.
-
-Internally, the @code{fontSize} context property will cause the
-@code{font-size} 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
-@code{font-size} number to a scaling factor.
-
-@lilypond[quote,fragment,relative=1,verbatim]
-c8
-\override NoteHead #'font-size = #-4
-c f
-\override NoteHead #'font-size = #3
-g
-@end 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
-@code{font-size} 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
-@internalsref{font-interface} layout interface.
-
-@refcommands
-
-The following commands set @code{fontSize} for the current voice:
-
-@cindex @code{\tiny}
-@code{\tiny}, 
-@cindex @code{\small}
-@code{\small}, 
-@cindex @code{\normalsize}
-@code{\normalsize}.
-
-
 @node Font selection
 @subsection Font selection
 

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index d8c4ad9e67e1bb6574868662794c403c67ce1004..85c055e2dc372668b61939aa5acca467a3bbb5f2 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -39,6 +39,7 @@ titles.
 
 @menu
 * Setting global staff size::   
+* Selecting notation font size::  
 * Paper size::                  
 * Page formatting::             
 * Score layout::                
@@ -141,6 +142,63 @@ staves.  The sizes of individual staves are relative to the global size.
 This manual: @ref{Selecting font sizes}.
 
 
+@node Selecting notation font size
+@subsection Selecting notation font size
+
+The easiest method of setting the font size of any context, is by
+setting the @code{fontSize} property.
+
+@lilypond[quote,fragment,relative=1,verbatim]
+c8
+\set fontSize = #-4
+c f
+\set fontSize = #3
+g
+@end lilypond
+
+@noindent
+It does not change the size of variable symbols, such as beams or
+slurs.
+
+Internally, the @code{fontSize} context property will cause the
+@code{font-size} 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
+@code{font-size} number to a scaling factor.
+
+@lilypond[quote,fragment,relative=1,verbatim]
+c8
+\override NoteHead #'font-size = #-4
+c f
+\override NoteHead #'font-size = #3
+g
+@end 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
+@code{font-size} 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
+@internalsref{font-interface} layout interface.
+
+@refcommands
+
+The following commands set @code{fontSize} for the current voice:
+
+@cindex @code{\tiny}
+@code{\tiny}, 
+@cindex @code{\small}
+@code{\small}, 
+@cindex @code{\normalsize}
+@code{\normalsize}.
+
+
 @node Paper size
 @subsection Paper size