Remove duplicate cindex entries.

diff --git a/ChangeLog b/ChangeLog
index 50768b7a89d693258da8a85b3d84b9a8b6b170d2..2070dfc8890afa80105bd46533c59ab41e70e725 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-17  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/tutorial.itely, basic-notation.itely,
+       changing-defaults.itely: remove duplicate cindex entries
+       that appear on the same page.
+
+       * scm/define-grobs.scm: change default padding for TextSpanner.
+
+       * Documentation/topdocs/AUTHORS.texi: update email address.
+
 2005-05-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/editor.scm (get-editor): Add platform defaults.

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 0488b7ce8d69a129f364114eceb109dfe24070e7..ec0dea186dbc331704691db316408eb8184b693e 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -382,7 +382,6 @@ Program reference: @internalsref{Dots}, and @internalsref{DotColumn}.
 Tuplets are made out of a music expression by multiplying all durations
 with a fraction
 
-@cindex @code{\times}
 @example
 \times @var{fraction} @var{musicexpr}
 @end example
@@ -2191,7 +2190,6 @@ arpeggiate the chord
 
 @refcommands
 
-@cindex @code{\arpeggio}
 @code{\arpeggio},
 @cindex @code{\arpeggioUp}
 @code{\arpeggioUp},
@@ -2323,16 +2321,12 @@ is equivalent to
 >>
 @end example
 
-@cindex @code{\voiceOne}
-@cindex @code{\voiceFour}
-
 The @code{\voiceXXX} commands set the direction of stems, slurs, ties,
 articulations, text annotations, augmentation dots of dotted
 notes, and fingerings.  @code{\voiceOne} and @code{\voiceThree} make
 these objects point upwards, while @code{\voiceTwo} and @code{\voiceFour}
 make them point downwards.  
 The command @code{\oneVoice} will revert back to the normal setting.
-@cindex @code{\oneVoice}
 
 An expression that appears directly inside a @code{<< >>} belongs to 
 the main voice.  This is useful when extra voices appear while the main

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 4fcfbcc450b4c7390607b95cc0ba940d3344e46e..6cbf9ef70f0c3cebf3aa904d3ebd8dd2aeca980c 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -176,7 +176,7 @@ This is useful if the context is referred to later on.  For example, when
 setting lyrics the melody is in a named context
 
 @example
-\CONtext Voice = "@b{tenor}" @var{music}
+\context Voice = "@b{tenor}" @var{music}
 @end example
 
 @noindent
@@ -217,7 +217,6 @@ With this mechanism, it is possible to define an Urtext (original
 edition), with the option to put several distinct articulations on the
 same notes.
 
-@cindex @code{\context}
 @cindex creating contexts
 
 The third command for creating contexts is

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index c1d331b774a755308343c9c53aed67d08f43d2e7..17ce243bed3438fe9f7ae2f4ea93e864bd442447 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1144,7 +1144,6 @@ in section @ref{Polyphony}.
 
 @cindex staff switch, manual
 @cindex cross staff voice, manual
-@cindex @code{\context}
 Piano music is typeset in two staves connected by a brace.  Printing
 such a staff is similar to the polyphonic example in @ref{More staves},