Policy updates.

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 8a47b637cf21fceebfe810c7269e4af150725c73..5d49c3b2ca640559c0bd85bc8ca418926979e03c 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -115,18 +115,6 @@
 
 @c   **** Links and references ****
 
-@c  TO BE DEPRECATED
-@c usage: @lsrdir{ancient,Ancient-notation}
-@macro lsrdir{SECTION,DIR}
-@ifhtml
-@uref{source/input/lsr/lilypond-snippets/\DIR\.html,\SECTION\}
-@end ifhtml
-@ifnothtml
-\DIR\
-@end ifnothtml
-@end macro
-
-
 @c  Definitions for references:
 @c     @rglos
 @c     @rlearning

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index ea933dd957b4fb974b5dbd576f20ab34b2969647..074c395a767445a63d3f1764e9f9e991529a48af 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -125,12 +125,12 @@ Notation Reference: @ref{Percussion staves},
 @ref{Mensural contexts}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Staff}, @internalsref{DrumStaff},
-@internalsref{GregorianTranscriptionStaff}, @internalsref{RhythmicStaff},
-@internalsref{TabStaff}, @internalsref{MensuralStaff},
-@internalsref{VaticanaStaff}, @internalsref{StaffSymbol}.
+Internals Reference: @rinternals{Staff}, @rinternals{DrumStaff},
+@rinternals{GregorianTranscriptionStaff}, @rinternals{RhythmicStaff},
+@rinternals{TabStaff}, @rinternals{MensuralStaff},
+@rinternals{VaticanaStaff}, @rinternals{StaffSymbol}.
 
 
 
@@ -260,13 +260,13 @@ Music Glossary: @rglos{brace},
 @rglos{bracket}, @rglos{grand staff}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Staff}, @internalsref{ChoirStaff},
-@internalsref{GrandStaff}, @internalsref{PianoStaff}, 
-@internalsref{StaffGroup}, @internalsref{systemStartDelimiter},
-@internalsref{SystemStartBar}, @internalsref{SystemStartBrace},
-@internalsref{SystemStartBracket}, @internalsref{systemStartSquare}.
+Internals Reference: @rinternals{Staff}, @rinternals{ChoirStaff},
+@rinternals{GrandStaff}, @rinternals{PianoStaff}, 
+@rinternals{StaffGroup}, @rinternals{systemStartDelimiter},
+@rinternals{SystemStartBar}, @rinternals{SystemStartBrace},
+@rinternals{SystemStartBracket}, @rinternals{systemStartSquare}.
 
 
 @node Deeper nested staff groups
@@ -385,12 +385,12 @@ source code, for instructions how to set them see @ref{Instrument names}.
 @seealso
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{InnerChoirStaffGroup}, 
-@internalsref{InnerStaffGroup}, @internalsref{SystemStartBar}, 
-@internalsref{SystemStartBrace}, @internalsref{SystemStartBracket},
-@internalsref{systemStartDelimiterHierarchy}.
+Internals Reference: @rinternals{InnerChoirStaffGroup}, 
+@rinternals{InnerStaffGroup}, @rinternals{SystemStartBar}, 
+@rinternals{SystemStartBrace}, @rinternals{SystemStartBracket},
+@rinternals{systemStartDelimiterHierarchy}.
 
 
 
@@ -554,7 +554,7 @@ b b
 
 Glossary: @rglos{line}, @rglos{ledger line}, @rglos{staff}.
 
-Internals Reference: @internalsref{StaffSymbol}.
+Internals Reference: @rinternals{StaffSymbol}.
 
 @knownissues
 
@@ -640,9 +640,9 @@ with the @code{\skip} command.
 Music Glossary: @rglos{ossia}, @rglos{staff}, @rglos{Frenched staff}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{StaffSymbol}.
+Internals Reference: @rinternals{StaffSymbol}.
 
 
 @node Hiding staves
@@ -758,11 +758,11 @@ of which it is written.
 Notation Reference: @ref{Staff symbol}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{ChordNames},
-@internalsref{FiguredBass}, @internalsref{Lyrics},
-@internalsref{Staff}, @internalsref{VerticalAxisGroup}.
+Internals Reference: @rinternals{ChordNames},
+@rinternals{FiguredBass}, @rinternals{Lyrics},
+@rinternals{Staff}, @rinternals{VerticalAxisGroup}.
 
 @node Writing parts
 @subsection Writing parts
@@ -825,9 +825,9 @@ Music Glossary: @rglos{metronome}, @rglos{metronomic indication},
 Notation Reference: @ref{Formatting text}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{MetronomeMark}, @ref{MIDI
+Internals Reference: @rinternals{MetronomeMark}, @ref{MIDI
 output}.
 
 
@@ -945,10 +945,10 @@ c1 c c c \break
 Notation Reference: @ref{Modifying context plug-ins}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{InstrumentName},
-@internalsref{PianoStaff}, @internalsref{Staff}.
+Internals Reference: @rinternals{InstrumentName},
+@rinternals{PianoStaff}, @rinternals{Staff}.
 
 
 @node Quoting other voices
@@ -1068,9 +1068,9 @@ written entirely in lower-case letters: @code{\addquote}.
 Notation Reference: @ref{Instrument transpositions}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{QuoteMusic}, @internalsref{Voice}.
+Internals Reference: @rinternals{QuoteMusic}, @rinternals{Voice}.
 
 
 @node Formatting cue notes
@@ -1182,8 +1182,8 @@ cbsn = \relative c, {
 @seealso
 
 Snippets:
-@lsrdir{Staff,Staff-notation}.
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Voice}.
+Internals Reference: @rinternals{Voice}.