policy and macros update.

diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index dda447e28eab2a85d3b050b07ba0429f0cd5377e..a4699a03c98a051f4cfe8ec632d78c0c303e9374 100644 (file)
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -117,12 +117,12 @@ that use fonts.  These are the ones supporting the
 @seealso
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{fontSize},
-@internalsref{font-size},
-@internalsref{font-interface}.
+@rinternals{fontSize},
+@rinternals{font-size},
+@rinternals{font-interface}.
 
 
 @node Fingering instructions
@@ -178,14 +178,14 @@ Notation Reference:
 @ref{Controlling direction and placement}
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{FingeringEvent},
-@internalsref{fingering-event},
-@internalsref{Fingering_engraver},
-@internalsref{New_fingering_engraver},
-@internalsref{Fingering}.
+@rinternals{FingeringEvent},
+@rinternals{fingering-event},
+@rinternals{Fingering_engraver},
+@rinternals{New_fingering_engraver},
+@rinternals{Fingering}.
 
 
 @node Hidden notes
@@ -231,11 +231,11 @@ e4(\p f)--
 @seealso
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{Note_spacing_engraver},
-@internalsref{NoteSpacing}.
+@rinternals{Note_spacing_engraver},
+@rinternals{NoteSpacing}.
 
 
 @node Coloring objects
@@ -314,7 +314,7 @@ Notation Reference:
 the input}.
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 @knownissues
 An X11 color is not necessarily exactly the same shade as a
@@ -358,12 +358,12 @@ c2 \parenthesize r
 @seealso
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{Parenthesis_engraver},
-@internalsref{ParenthesesItem},
-@internalsref{parentheses-interface}.
+@rinternals{Parenthesis_engraver},
+@rinternals{ParenthesesItem},
+@rinternals{parentheses-interface}.
 
 @knownissues
 
@@ -406,12 +406,12 @@ Notation Reference:
 @ref{Controlling direction and placement}.
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{Stem_engraver},
-@internalsref{Stem},
-@internalsref{stem-interface}.
+@rinternals{Stem_engraver},
+@rinternals{Stem},
+@rinternals{stem-interface}.
 
 
 @node Outside the staff
@@ -478,12 +478,12 @@ altered:
 @seealso
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{Balloon_engraver},
-@internalsref{BalloonTextItem},
-@internalsref{balloon-interface}.
+@rinternals{Balloon_engraver},
+@rinternals{BalloonTextItem},
+@rinternals{balloon-interface}.
 
 
 @node Grid lines
@@ -537,15 +537,15 @@ lines.
 @seealso
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{Grid_line_span_engraver},
-@internalsref{Grid_point_engraver},
-@internalsref{GridLine},
-@internalsref{GridPoint},
-@internalsref{grid-line-interface},
-@internalsref{grid-point-interface}.
+@rinternals{Grid_line_span_engraver},
+@rinternals{Grid_point_engraver},
+@rinternals{GridLine},
+@rinternals{GridPoint},
+@rinternals{grid-line-interface},
+@rinternals{grid-point-interface}.
 
 
 @node Analysis brackets
@@ -592,11 +592,11 @@ Analysis brackets may be nested.
 @seealso
 
 Snippets:
-@lsrdir{Editorial,Editorial-annotations}.
+@rlsr{Editorial annotations}.
 
 Internals Reference:
-@internalsref{Horizontal_bracket_engraver},
-@internalsref{HorizontalBracket},
-@internalsref{horizontal-bracket-interface},
-@internalsref{Staff}.
+@rinternals{Horizontal_bracket_engraver},
+@rinternals{HorizontalBracket},
+@rinternals{horizontal-bracket-interface},
+@rinternals{Staff}.
 

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index f24473f2f4bc9a7f56ec443fc54180bbae775e63..c0ac7b89ef0dec568236d33b68bc50b203d20f2b 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -148,10 +148,10 @@ Music Glossary: @rglos{tenuto}, @rglos{accent}, @rglos{staccato},
 @rglos{portato}.
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
-Internals Reference: @internalsref{Script},
-@internalsref{TextScript}.
+Internals Reference: @rinternals{Script},
+@rinternals{TextScript}.
 
 
 @knownissues
@@ -325,7 +325,7 @@ To create new absolute dynamic marks or text that should be
 aligned with dynamics, see @ref{New dynamic marks}.
 
 Vertical positioning of dynamics is handled by
-@internalsref{DynamicLineSpanner}.
+@rinternals{DynamicLineSpanner}.
 
 
 @predefined
@@ -385,12 +385,12 @@ Learning Manual:
 @rlearning{Articulation and dynamics}.
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
 Internals Reference:
-@internalsref{DynamicText},
-@internalsref{Hairpin},
-@internalsref{DynamicLineSpanner}.
+@rinternals{DynamicText},
+@rinternals{Hairpin},
+@rinternals{DynamicLineSpanner}.
 
 
 @node New dynamic marks
@@ -432,7 +432,7 @@ boxf = \markup{ \bracket { \dynamic f } }
 @seealso
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
 
 @node Curves
@@ -504,9 +504,9 @@ can be achieved in LilyPond by setting @code{doubleSlurs},
 Music Glossary: @rglos{slur}
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
-Internals Reference: @internalsref{Slur}.
+Internals Reference: @rinternals{Slur}.
 
 
 @node Phrasing slurs
@@ -549,9 +549,9 @@ You cannot have simultaneous phrasing slurs.
 @seealso
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
-Internals Reference: @internalsref{PhrasingSlur}
+Internals Reference: @rinternals{PhrasingSlur}
 
 
 @node Breath marks
@@ -585,10 +585,10 @@ d4
 @seealso
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 @c @lsr{expressive,breathing-sign.ly}.
 
-Internals Reference: @internalsref{BreathingSign}
+Internals Reference: @rinternals{BreathingSign}
 
 
 @node Falls and doits
@@ -632,7 +632,7 @@ c4-\bendAfter #-3
 @c Music Glossary: @rglos{falls}, @rglos{doits}.
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
 
 @node Lines
@@ -679,13 +679,13 @@ I = \once \override NoteColumn #'ignore-collision = ##t
 Music Glossary: @rglos{glissando}
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
 @c FIXME: I need to figure out what's up with these.  -gp
 @c @lsr{expressive,glissando.ly},
 @c @lsr{expressive,line-styles.ly}
 
-Internals Reference: @internalsref{Glissando}
+Internals Reference: @rinternals{Glissando}
 
 
 @knownissues
@@ -817,10 +817,10 @@ Music Glossary: @rglos{arpeggio}
 Notation Reference: @ref{Ties}, for writing out arpeggios.
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
-Internals Reference: @internalsref{Arpeggio},
-@internalsref{PianoStaff}.
+Internals Reference: @rinternals{Arpeggio},
+@rinternals{PianoStaff}.
 
 
 @knownissues
@@ -885,6 +885,6 @@ printed as a stemless note head in parentheses.
 Music Glossary: @rglos{trill}
 
 Snippets:
-@lsrdir{Expressive,Expressive-marks}.
+@rlsr{Expressive marks}.
 
-Internals Reference: @internalsref{TrillSpanner}
+Internals Reference: @rinternals{TrillSpanner}

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 0e4eac5f1cdb55737ff9e9fca1279b1fbf45c1a9..8a47b637cf21fceebfe810c7269e4af150725c73 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -10,7 +10,7 @@
 
 @c   ***** Displaying text *****
 
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
+@c we need this since @q{\} doesn't work with makeinfo 4.11 --
 @c say @q{@bs{}} instead
 @macro bs
 \\
@@ -115,17 +115,7 @@
 
 @c   **** Links and references ****
 
-@c  Possibly deprecated; under discussion.
-@c usage: @lsr{ancient,Ancient-notation,custodes.ly}
-@macro lsr{SECTION,DIR,TEXT}
-@ifhtml
-@uref{source/input/lsr/lilypond-snippets/\DIR\.html#\TEXT\,@file{\SECTION\/\TEXT\}}
-@end ifhtml
-@ifnothtml
-@file{\SECTION\/\TEXT\}
-@end ifnothtml
-@end macro
-
+@c  TO BE DEPRECATED
 @c usage: @lsrdir{ancient,Ancient-notation}
 @macro lsrdir{SECTION,DIR}
 @ifhtml
@@ -138,30 +128,33 @@
 
 
 @c  Definitions for references:
-@c     @internalsref
 @c     @rglos
-@c     @rprogram
-@c     @ruser
 @c     @rlearning
+@c     @ruser
+@c     @rprogram
+@c     @rsnippets
+@c     @rinternals
 
 @ifhtml
 @c ***** HTML *****
 
 @ifset bigpage
 
+@c TO BE DEPRECATED
 @macro internalsref{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
 @end macro
 
+
 @macro rglos{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,music-glossary-big-page,Music Glossary}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Application Usage}
+@ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
@@ -169,33 +162,40 @@
 @ref{\TEXT\,,,lilypond-big-page,Notation Reference}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual}
+@ref{\TEXT\,,,lilypond-program-big-page,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets-big-page,Snippets}
 @end macro
 
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
+@end macro
+
 @end ifset
 
 
 @ifclear bigpage
 
+@c  DEPRECATED
 @macro internalsref{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-internals,Internals Reference}
 @end macro
 
+
 @macro rglos{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,music-glossary,Music Glossary}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
@@ -203,15 +203,20 @@
 @ref{\TEXT\,,,lilypond,Notation Reference}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,lilypond-program,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Snippets}
 @end macro
 
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@end macro
+
 @end ifclear
 
 @end ifhtml
@@ -220,19 +225,22 @@
 @ifdocbook
 @c ***** DOCBOOK-XML *****
 
+@c  DEPRECATED
 @macro internalsref{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-internals,Internals Reference}
 @end macro
 
+
+
 @macro rglos{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,music-glossary,Music Glossary}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
@@ -240,34 +248,42 @@
 @ref{\TEXT\,,,lilypond,Notation Reference}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,lilypond-program,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Snippets}
 @end macro
 
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@end macro
+
 @end ifdocbook
 
 
 @ifinfo
 @c **** INFO ****
 
+@c DEPRECATED
 @macro internalsref{TEXT}
 @vindex \TEXT\
 @inforef{\TEXT\,,lilypond-internals,Internals Reference}
 @end macro
 
+
+
 @macro rglos{TEXT}
 @vindex \TEXT\
 @inforef{\TEXT\,,music-glossary,Music Glossary}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
@@ -275,47 +291,60 @@
 @ref{\TEXT\,,,lilypond,Notation Reference}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,lilypond-program,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Snippets}
 @end macro
 
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@inforef{\TEXT\,,lilypond-internals,Internals Reference}
+@end macro
+
 @end ifinfo
 
 
 @c **** TEX ****
 @iftex
 
+@c DEPRECATED
 @macro internalsref{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}
 @end macro
 
-@macro rglos {TEXT}
+
+
+@macro rglos{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,music-glossary,Music Glossary}
 @end macro
 
-@macro rprogram{TEXT}
-program usage manual, @ref{\TEXT\,,,lilypond-program,Application Usage}
+@macro rlearning{TEXT}
+learning manual, @ref{\TEXT\,,,lilypond-learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
 notation reference, @ref{\TEXT\,,,lilypond,Notation Reference}
 @end macro
 
-@macro rlearning{TEXT}
-learning manual, @ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@macro rprogram{TEXT}
+program usage manual, @ref{\TEXT\,,,lilypond-program,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Snippets}
 @end macro
 
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
+@end macro
+
 @end iftex
 
 

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 814fef2f797407ad0e1a53d2af0ccae33d696074..348c2cdec06ad73d67de0994e974a39a209cc07d 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -53,7 +53,7 @@ through@tie{}@code{g}.  The note names @code{c} to @code{b} are
 engraved in the octave below middle C.
 
 @c don't use c' here.
-@lilypond[verbatim,quote,ragged-right,fragment]
+@lilypond[verbatim,quote,fragment]
 \clef bass
 c d e f
 g a b c
@@ -68,7 +68,7 @@ or comma@tie{}(@code{,}) character.  Each@tie{}@code{'} raises the
 pitch by one octave; each@tie{}@code{,} lowers the pitch by an
 octave.
 
-@lilypond[verbatim,quote,ragged-right,fragment]
+@lilypond[verbatim,quote,fragment]
 \clef treble
 c' c'' e' g
 d'' d' d c
@@ -83,7 +83,7 @@ Music Glossary:
 @rglos{Pitch names}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 
 @node Relative octave entry
@@ -134,7 +134,7 @@ absolute octave mode, and it is recommended that it be a octave of
 
 Here is the relative mode shown in action:
 
-@lilypond[verbatim,quote,ragged-right]
+@lilypond[verbatim,quote]
 \relative c {
   \clef bass
   c d e f
@@ -146,7 +146,7 @@ Here is the relative mode shown in action:
 Octave changing marks are used for intervals greater than a
 fourth:
 
-@lilypond[verbatim,quote,ragged-right]
+@lilypond[verbatim,quote]
 \relative c'' {
   c g c f,
   c' a, e'' c
@@ -207,10 +207,10 @@ Notation Reference:
 @ref{Octave checks}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{RelativeOctaveMusic}.
+@rinternals{RelativeOctaveMusic}.
 
 
 @funindex \transpose
@@ -344,13 +344,13 @@ Notation Reference:
 @ref{Note names in other languages}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{Accidental_engraver}, 
-@internalsref{Accidental},
-@internalsref{AccidentalCautionary},
-@internalsref{accidental-interface}.
+@rinternals{Accidental_engraver}, 
+@rinternals{Accidental},
+@rinternals{AccidentalCautionary},
+@rinternals{accidental-interface}.
 
 
 @knownissues
@@ -466,7 +466,7 @@ Music Glossary:
 @rglos{Pitch names}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 
 @node Changing multiple pitches
@@ -542,10 +542,10 @@ checks fail, but the second one does not fail.
 @seealso
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{RelativeOctaveCheck}.
+@rinternals{RelativeOctaveCheck}.
 
 
 @node Transpose
@@ -658,10 +658,10 @@ Notation Reference:
 @ref{Instrument transpositions}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{TransposedMusic}.
+@rinternals{TransposedMusic}.
 
 @funindex \transpose
 @funindex \chordmode
@@ -798,13 +798,13 @@ Notation Reference:
 @ref{Ancient clefs}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{Clef_engraver},
-@internalsref{Clef},
-@internalsref{OctavateEight},
-@internalsref{clef-interface}.
+@rinternals{Clef_engraver},
+@rinternals{Clef},
+@rinternals{OctavateEight},
+@rinternals{clef-interface}.
 
 
 @node Key signature
@@ -876,16 +876,16 @@ Learning Manual:
 @rlearning{Accidentals and key signatures}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{KeyChangeEvent},
-@internalsref{Key_engraver},
-@internalsref{Key_performer},
-@internalsref{KeyCancellation},
-@internalsref{KeySignature},
-@internalsref{key-cancellation-interface},
-@internalsref{key-signature-interface}.
+@rinternals{KeyChangeEvent},
+@rinternals{Key_engraver},
+@rinternals{Key_performer},
+@rinternals{KeyCancellation},
+@rinternals{KeySignature},
+@rinternals{key-cancellation-interface},
+@rinternals{key-signature-interface}.
 
 
 @node Ottava brackets
@@ -924,12 +924,12 @@ Music Glossary:
 @rglos{octavation}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{Ottava_spanner_engraver},
-@internalsref{OttavaBracket},
-@internalsref{ottava-bracket-interface}.
+@rinternals{Ottava_spanner_engraver},
+@rinternals{OttavaBracket},
+@rinternals{ottava-bracket-interface}.
 
 
 
@@ -1023,7 +1023,7 @@ Notation Reference:
 @ref{Quoting other voices}, @ref{Transpose}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 
 @node Automatic accidentals
@@ -1728,17 +1728,17 @@ musicB = {
 @seealso
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{Accidental},
-@internalsref{Accidental_engraver},
-@internalsref{GrandStaff} and
-@internalsref{PianoStaff},
-@internalsref{Staff},
-@internalsref{AccidentalSuggestion},
-@internalsref{AccidentalPlacement},
-@internalsref{accidental-suggestion-interface}.
+@rinternals{Accidental},
+@rinternals{Accidental_engraver},
+@rinternals{GrandStaff} and
+@rinternals{PianoStaff},
+@rinternals{Staff},
+@rinternals{AccidentalSuggestion},
+@rinternals{AccidentalPlacement},
+@rinternals{accidental-suggestion-interface}.
 
 
 @cindex accidentals and simultaneous notes
@@ -1806,17 +1806,17 @@ Music Glossary:
 @rglos{ambitus}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{Ambitus_engraver},
-@internalsref{Voice},
-@internalsref{Staff},
-@internalsref{Ambitus},
-@internalsref{AmbitusAccidental},
-@internalsref{AmbitusLine},
-@internalsref{AmbitusNoteHead},
-@internalsref{ambitus-interface}.
+@rinternals{Ambitus_engraver},
+@rinternals{Voice},
+@rinternals{Staff},
+@rinternals{Ambitus},
+@rinternals{AmbitusAccidental},
+@rinternals{AmbitusLine},
+@rinternals{AmbitusNoteHead},
+@rinternals{ambitus-interface}.
 
 
 @knownissues
@@ -1875,19 +1875,19 @@ To see all note head styles, see @ref{Note head styles}.
 @seealso
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Notation Reference:
 @ref{Note head styles}.
 
 Internals Reference:
-@internalsref{note-event},
-@internalsref{Note_heads_engraver},
-@internalsref{Ledger_line_engraver},
-@internalsref{NoteHead},
-@internalsref{LedgerLineSpanner},
-@internalsref{note-head-interface},
-@internalsref{ledger-line-spanner-interface}.
+@rinternals{note-event},
+@rinternals{Note_heads_engraver},
+@rinternals{Ledger_line_engraver},
+@rinternals{NoteHead},
+@rinternals{LedgerLineSpanner},
+@rinternals{note-head-interface},
+@rinternals{ledger-line-spanner-interface}.
 
 
 @node Easy notation note heads
@@ -1934,13 +1934,13 @@ Notation Reference:
 @ref{Setting the staff size}.
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{note-event},
-@internalsref{Note_heads_engraver},
-@internalsref{NoteHead},
-@internalsref{note-head-interface}.
+@rinternals{note-event},
+@rinternals{Note_heads_engraver},
+@rinternals{NoteHead},
+@rinternals{note-head-interface}.
 
 
 @node Shape note heads
@@ -1993,16 +1993,16 @@ To see all note head styles, see @ref{Note head styles}.
 @seealso
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Notation Reference:
 @ref{Note head styles}.
 
 Internals Reference:
-@internalsref{note-event},
-@internalsref{Note_heads_engraver},
-@internalsref{NoteHead},
-@internalsref{note-head-interface}.
+@rinternals{note-event},
+@rinternals{Note_heads_engraver},
+@rinternals{NoteHead},
+@rinternals{note-head-interface}.
 
 
 @node Improvisation
@@ -2042,11 +2042,11 @@ rhythm.  Such note heads can be created:
 @seealso
 
 Snippets:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 Internals Reference:
-@internalsref{Pitch_squash_engraver},
-@internalsref{Voice},
-@internalsref{RhythmicStaff}.
+@rinternals{Pitch_squash_engraver},
+@rinternals{Voice},
+@rinternals{RhythmicStaff}.
 
 

diff --git a/Documentation/user/policy.txt b/Documentation/user/policy.txt
index 0939a439acbc6c4fc44c6d9b78625a311b63ff86..7fe186a3f1e2a67fe004de2a4678392fecd2d91a 100644 (file)
--- a/Documentation/user/policy.txt
+++ b/Documentation/user/policy.txt
@@ -106,13 +106,11 @@ main docs
     Installed Files:
     @file{path/to/dir/blahz}.
 
-    Snippets:
-    @lsrdir{section},
-    @lsr{specific/example-name.ly}.
+    Snippets: @rlsr{section}.
 
     Internals Reference:
-    @internalsref{fazzle},
-    @internalsref{booar}.
+    @rinternals{fazzle},
+    @rinternals{booar}.
 
       If there are multiple entries, separate them by commas
       but do not include an `and'.

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index 0e89f26a4a80f7b00fed2bccbed7e216c5d4f19d..ab8bc3d53fcc8af3b539f12b40bc103eef172aa1 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -144,11 +144,11 @@ Notation Reference:
 @ref{Proportional notation}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 Internals Reference:
-@internalsref{Dots},
-@internalsref{DotColumn}.
+@rinternals{Dots},
+@rinternals{DotColumn}.
 
 
 @knownissues
@@ -249,12 +249,12 @@ Notation Reference:
 @ref{Polymetric notation}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 Internals Reference:
-@internalsref{TupletBracket},
-@internalsref{TupletNumber},
-@internalsref{TimeScaledMusic}.
+@rinternals{TupletBracket},
+@rinternals{TupletNumber},
+@rinternals{TimeScaledMusic}.
 
 @knownissues
 @cindex grace notes within tuplet brackets
@@ -345,7 +345,7 @@ Notation Reference:
 @ref{Polymetric notation}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 
 @node Ties
@@ -476,13 +476,13 @@ Music Glossary:
 Notation Reference: @ref{Automatic note splitting}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 Internals Reference:
-@internalsref{LaissezVibrerTie},
-@internalsref{LaissezVibrerTieColumn},
-@internalsref{TieColumn},
-@internalsref{Tie}.
+@rinternals{LaissezVibrerTie},
+@rinternals{LaissezVibrerTieColumn},
+@rinternals{TieColumn},
+@rinternals{Tie}.
 
 
 @knownissues
@@ -565,9 +565,9 @@ a4\rest d4\rest
 Notation Reference: @ref{Full measure rests}
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internals Reference: @internalsref{Rest}
+Internals Reference: @rinternals{Rest}
 
 
 @knownissues
@@ -638,9 +638,9 @@ empty page:
 @seealso
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internals Reference: @internalsref{SkipMusic}
+Internals Reference: @rinternals{SkipMusic}
 
 
 @node Full measure rests
@@ -812,12 +812,12 @@ Notation Reference:
 @ref{Text scripts}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 Internals Reference:
-@internalsref{MultiMeasureRest},
-@internalsref{MultiMeasureRestNumber},
-@internalsref{MultiMeasureRestText}.
+@rinternals{MultiMeasureRest},
+@rinternals{MultiMeasureRestNumber},
+@rinternals{MultiMeasureRestText}.
 
 
 @knownissues
@@ -938,8 +938,8 @@ Options to group beats within a bar are available through the
 Scheme function @code{set-time-signature}, which takes three
 arguments: the number of beats, the beat length, and the internal
 grouping of beats in the measure.  If the
-@internalsref{Measure_grouping_engraver} is included, the function
-will also create @internalsref{MeasureGrouping} signs.  Such signs
+@rinternals{Measure_grouping_engraver} is included, the function
+will also create @rinternals{MeasureGrouping} signs.  Such signs
 ease reading rhythmically complex modern music.  In the example,
 the 9/8 measure is subdivided in 2, 2, 2 and 3.  This is passed to
 @code{set-time-signature} as the third argument: @code{'(2 2 2 3)}:
@@ -979,11 +979,11 @@ Notation Reference:
 @ruser{Time administration}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 Internals Reference:
-@internalsref{TimeSignature},
-@internalsref{Timing_translator}.
+@rinternals{TimeSignature},
+@rinternals{Timing_translator}.
 
 
 @knownissues
@@ -1040,9 +1040,9 @@ Music Glossary: @rglos{anacrusis}
 Notation Reference: @ref{Grace notes}
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internal Reference: @internalsref{Timing_translator}
+Internal Reference: @rinternals{Timing_translator}
 
 @knownissues
 
@@ -1114,7 +1114,7 @@ Music Glossary: @rglos{cadenza}
 Notation Reference: @ref{Controlling visibility of objects}
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 @knownissues
 
@@ -1259,14 +1259,14 @@ Music Glossary:
 Notation Reference: @ref{Scaling durations}
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 @c Is this still permitted?
 @c @lsr{contemporary,compound-time-signature}
 
 Internals Reference:
-@internalsref{TimeSignature},
-@internalsref{Timing-translator},
-@internalsref{Staff}.
+@rinternals{TimeSignature},
+@rinternals{Timing-translator},
+@rinternals{Staff}.
 
 @knownissues
 
@@ -1314,12 +1314,12 @@ Learning Manual:
 @rlearning{Adding and removing engravers}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 Internals Reference:
-@internalsref{Note_heads_engraver},
-@internalsref{Completion_heads_engraver},
-@internalsref{Forbid_line_break_engraver}.
+@rinternals{Note_heads_engraver},
+@rinternals{Completion_heads_engraver},
+@rinternals{Forbid_line_break_engraver}.
 
 
 @knownissues
@@ -1472,9 +1472,9 @@ f8 f''8 f8 f''8
 Notation Reference: @ref{Manual beams}, @ref{Setting automatic beam behavior}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internals Reference: @internalsref{Beam}.
+Internals Reference: @rinternals{Beam}.
 
 
 @knownissues
@@ -1672,7 +1672,7 @@ automatic beam is still accepting notes, it is not typeset.
 @seealso
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 
 @node Manual beams
@@ -1784,7 +1784,7 @@ music snippets, and when numbers in the fraction are small.
 @seealso
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 
 
@@ -1941,11 +1941,11 @@ Notation Reference: @ref{Line breaking}, @ref{Repeats},
 @c @ref{System start delimiters}.
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internals Reference: @internalsref{BarLine} (created at
-@internalsref{Staff} level), @internalsref{SpanBar} (across
-staves), @internalsref{Timing_translator} (for Timing
+Internals Reference: @rinternals{BarLine} (created at
+@rinternals{Staff} level), @rinternals{SpanBar} (across
+staves), @rinternals{Timing_translator} (for Timing
 properties).
 
 
@@ -2084,16 +2084,16 @@ Bar numbers can be removed entirely by removing the
 @seealso
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internals Reference: @internalsref{BarNumber}.
+Internals Reference: @rinternals{BarNumber}.
 
 
 @knownissues
 
 Bar numbers may collide with the top of the
-@internalsref{StaffGroup} bracket, if there is one.  To solve
-this, the @code{padding} property of @internalsref{BarNumber} can
+@rinternals{StaffGroup} bracket, if there is one.  To solve
+this, the @code{padding} property of @rinternals{BarNumber} can
 be used to position the number correctly.
 
 Bar numbers may only be printed at bar lines; to print a bar
@@ -2182,7 +2182,7 @@ when it is processed.
 @seealso
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 
 @node Rehearsal marks
@@ -2289,11 +2289,11 @@ For common tweaks to the positioning of rehearsal marks, see
 @seealso
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 This manual: @ref{The Feta font}, @ref{Formatting text}.
 
-Internals Reference: @internalsref{RehearsalMark}.
+Internals Reference: @rinternals{RehearsalMark}.
 
 Init files: @file{scm/@/translation@/-functions@/.scm} contains
 the definition of @code{format-mark-numbers} and
@@ -2478,9 +2478,9 @@ Music Glossary:
 @rglos{appoggiatura}
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internals Reference: @internalsref{GraceMusic}.
+Internals Reference: @rinternals{GraceMusic}.
 
 
 @knownissues
@@ -2549,7 +2549,7 @@ cadenza = \relative c' {
 @seealso
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
 
 @node Time administration
@@ -2629,8 +2629,8 @@ notes.
 This manual: @ref{Bar numbers}, @ref{Unmetered music}
 
 Snippets:
-@lsrdir{Rhythms,Rhythms}.
+@rlsr{Rhythms}.
 
-Internals Reference: @internalsref{Timing_translator},
-@internalsref{Score}
+Internals Reference: @rinternals{Timing_translator},
+@rinternals{Score}