reverted unwanted commits

[lilypond.git] / Documentation / user / advanced-notation.itely

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 25c972f908a654f2572741930e25f702d671e0e6..1bb72ecc824cdc5168a0464218708319090b6ac3 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -75,9 +75,9 @@ The @code{\markup} is described in more detail in
 
 @refcommands
 
-@findex \fatText
+@funindex \fatText
 @code{\fatText},
-@findex \emptyText
+@funindex \emptyText
 @code{\emptyText}.
 
 
@@ -157,13 +157,14 @@ Examples: @inputfileref{input/@/regression,text@/-spanner@/.ly}.
 @cindex segno on bar line
 @cindex fermata on bar line
 @cindex bar lines, symbols on
-@findex \mark
+@funindex \mark
 
 The @code{\mark} command is primarily used for
 @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
+access the appropriate symbol (symbols are listed in
+@ref{The Feta font})
 
 @lilypond[fragment,quote,ragged-right,verbatim,relative=2]
 c1 \mark \markup { \musicglyph #"scripts.ufermata" }
@@ -304,7 +305,7 @@ but it can also be used anywhere text is called in lilypond
 
 Text can also be placed on its own, away from any @code{\score}
 block.  This is primarily used in a @code{\book} (see
-@ref{Multiple movements}).
+@ref{Multiple scores in a book}).
 
 @lilypond[quote,ragged-right,verbatim]
 \markup{ Here is some text. }
@@ -450,7 +451,7 @@ The following commands can all be used inside @code{\markup @{ @}}.
 
 @cindex font selection
 @cindex font magnification
-@findex font-interface
+@funindex font-interface
 
 By setting the object properties described below, you can select a
 font from the preconfigured font families.  LilyPond has default
@@ -613,7 +614,7 @@ individual parts.
 @cindex Rests, multi measure
 @cindex Rests, full measure
 @cindex whole rests for a full measure
-@findex R
+@funindex R
 
 Rests for one full measure (or many bars) are entered using `@code{R}'.  It
 is specifically meant for full bar rests and for entering parts: the rest
@@ -735,7 +736,7 @@ Metronome settings can be entered as follows
 
 In the MIDI output, they are interpreted as a tempo change.  In the
 layout output, a metronome marking is printed
-@findex \tempo
+@funindex \tempo
 @lilypond[quote,ragged-right,verbatim,fragment]
 \tempo 8.=120 c''1
 @end lilypond
@@ -785,7 +786,7 @@ further away from the staff.
 @subsection Rehearsal marks
 
 @cindex Rehearsal marks
-@findex \mark
+@funindex \mark
 
 To print a rehearsal mark, use the @code{\mark} command
 
@@ -898,7 +899,7 @@ Examples: @inputfileref{input/@/regression,rehearsal@/-mark@/-letter@/.ly},
 
 @cindex Bar numbers
 @cindex measure numbers
-@findex currentBarNumber
+@funindex currentBarNumber
 
 Bar numbers are printed by default at the start of the line.  The
 number itself is stored in the @code{currentBarNumber} property, which
@@ -1154,7 +1155,7 @@ during an octavation bracket.
 @node Different editions from one source
 @subsection Different editions from one source
 
-@findex \tag
+@funindex \tag
 @cindex tag
 
 The @code{\tag} command marks music expressions with a name.  These
@@ -2004,8 +2005,6 @@ c f
 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
@@ -2019,11 +2018,11 @@ use fonts. These are the ones supporting the
 
 The following commands set @code{fontSize} for the current voice:
 
-@findex \tiny
+@funindex \tiny
 @code{\tiny},
-@findex \small
+@funindex \small
 @code{\small},
-@findex \normalsize
+@funindex \normalsize
 @code{\normalsize}.
 
 
@@ -2112,8 +2111,8 @@ emptymusic = {
 @cindex Invisible notes
 @cindex Transparent notes
 
-@findex \hideNotes
-@findex \unHideNotes
+@funindex \hideNotes
+@funindex \unHideNotes
 Hidden (or invisible or transparent) notes can be useful in preparing theory
 or composition exercises.
 
@@ -2148,10 +2147,10 @@ Shape note heads can be produced by setting @code{\aikenHeads} or
 Shapes are determined on the step in the scale, where the base of the
 scale is determined by  the @code{\key} command
 
-@findex \key
-@findex shapeNoteStyles
-@findex \aikenHeads
-@findex \sacredHarpHeads
+@funindex \key
+@funindex shapeNoteStyles
+@funindex \aikenHeads
+@funindex \sacredHarpHeads
 
 Shape note heads are implemented through the @code{shapeNoteStyles}
 property.  Its value is a vector of symbols.  The k-th element indicates
@@ -2187,7 +2186,7 @@ to be printed in a large font size.  To print with a larger font, see
 
 @refcommands
 
-@findex \setEasyHeads
+@funindex \setEasyHeads
 @code{\setEasyHeads}
 
 
@@ -2241,7 +2240,7 @@ e
 @end lilypond
 
 The full range of colors defined for X11 can be accessed by using the
-scheme function x11-color.  The function takes one argument that can be a
+Scheme function x11-color.  The function takes one argument that can be a
 symbol
 
 @example