From ecd34079d2df7ba2c28b3c76740cd0b9f157d61b Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Mon, 3 Jun 2013 12:17:44 +0200
Subject: [PATCH] Issue 3392: Use @dots{} instead of ... in notation manual
 where appropriate

This uses a typographically preferable variant, and also may render
better in Info format in some circumstances.
---
 Documentation/notation/ancient.itely          |  6 +-
 .../notation/changing-defaults.itely          | 16 ++---
 Documentation/notation/cheatsheet.itely       |  2 +-
 Documentation/notation/chords.itely           |  8 +--
 Documentation/notation/input.itely            | 64 +++++++++----------
 Documentation/notation/repeats.itely          |  2 +-
 Documentation/notation/rhythms.itely          |  2 +-
 Documentation/notation/simultaneous.itely     | 12 ++--
 8 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index dea2995c66..8444d62dd0 100644
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -255,7 +255,7 @@ be collected and printed in front of it.
 
 The syntax still uses the deprecated infix style
 @code{\[ music expr \]}.  For consistency reasons, it will eventually
-be changed to postfix style @code{note\[ ... note\]}.
+be changed to postfix style @code{note\[ @dots{} note\]}.
 
 @c Alternatively, the file
 @c @file{gregorian-init.ly} can be included; it provides a scheme
@@ -1505,7 +1505,7 @@ A note name without any qualifiers will produce a @emph{punctum}.
 All other neumes, including the single-note neumes with a
 different shape such as the @emph{virga}, are in principle
 considered as ligatures and should therefore be placed
-between @code{\[...\]}.
+between @code{\[@dots{}\]}.
 @c Regarding the @emph{punctum}, @code{b} and @code{\[ b \]} are
 @c equivalent.
 
@@ -2703,7 +2703,7 @@ the @code{Stem_engraver} from the Voice context:
 
 @example
 \layout @{
-  ...
+  @dots{}
   \context @{
     \Voice
       \remove "Stem_engraver"
diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
index 5a364f134d..917bc1fd5d 100644
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -456,7 +456,7 @@ when lyrics are associated with music:
 
 @example
 \new Voice = "tenor" @var{music}
-...
+@dots{}
 \new Lyrics \lyricsto "tenor" @var{lyrics}
 @end example
 
@@ -499,12 +499,12 @@ an earlier context.
 
 There is an exception to this general rule: just one of the
 @code{Voice} contexts in a @code{Staff} context or in a
-@code{<<...>>} construct will always persist to the end of the
-enclosing @code{Staff} context or @code{<<...>>} construct, even
+@code{<<@dots{}>>} construct will always persist to the end of the
+enclosing @code{Staff} context or @code{<<@dots{}>>} construct, even
 though there may be periods when it has nothing to do.  The context
 to persist in this way will be the first one encountered in the
-first enclosed @code{@{...@}} construct, ignoring any in enclosed
-@code{<<...>>} constructs.
+first enclosed @code{@{@dots{}@}} construct, ignoring any in enclosed
+@code{<<@dots{}>>} constructs.
 
 Any context can be kept alive by ensuring it has something to do at
 every musical moment.  @code{Staff} contexts are kept alive by
@@ -675,7 +675,7 @@ modifying it,
   @emph{etc.}
 @}
 @{
-  @emph{..music..}
+  @emph{@dots{}music@dots{}}
 @}
 @end example
 
@@ -957,7 +957,7 @@ command:
 \with @{
   [context settings for this context instance only]
 @} @{
-...
+  @dots{}
 @}
 @end example
 
@@ -2356,7 +2356,7 @@ We have seen two methods of changing properties: @code{\set} and
 properties.
 
 @code{fontSize} is a special property: it is equivalent to
-entering @code{\override ... #'font-size} for all pertinent
+entering @code{\override @dots{} #'font-size} for all pertinent
 objects.  Since this is a common change, the special
 property (modified with @code{\set}) was created.
 
diff --git a/Documentation/notation/cheatsheet.itely b/Documentation/notation/cheatsheet.itely
index cc737a484f..711be9782a 100644
--- a/Documentation/notation/cheatsheet.itely
+++ b/Documentation/notation/cheatsheet.itely
@@ -155,7 +155,7 @@ a8-[ b-]
 @end lilypond
 
 
-@item @code{<< \new Staff ... >>}
+@item @code{<< \new Staff @dots{} >>}
 @tab more staves
 @tab
 @lilypond[relative=1]
diff --git a/Documentation/notation/chords.itely b/Documentation/notation/chords.itely
index 593e04a05a..80f716bd1b 100644
--- a/Documentation/notation/chords.itely
+++ b/Documentation/notation/chords.itely
@@ -483,8 +483,8 @@ Rests passed to a @code{ChordNames} context will cause the
 
 @funindex{\chords}
 
-@code{\chords @{ ... @}} is a shortcut notation for
-@code{\new ChordNames @{ \chordmode @{ ... @} @}}.
+@code{\chords @{ @dots{} @}} is a shortcut notation for
+@code{\new ChordNames @{ \chordmode @{ @dots{} @}}.
 
 @lilypond[verbatim,quote,ragged-right]
 \chords {
@@ -831,8 +831,8 @@ entry of bass figures, and there is a context named
 @code{BassFigure} objects.  Figured bass can also be displayed
 in @code{Staff} contexts.
 
-@code{\figures@{ ... @}} is a shortcut notation for
-@code{\new FiguredBass @{ \figuremode @{ ... @} @}}.
+@code{\figures@{ @dots{} @}} is a shortcut notation for
+@code{\new FiguredBass @{ \figuremode @{ @dots{} @} @}}.
 
 
 Although the support for figured bass may superficially resemble chord
diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 8c16fd32d7..80cdd1794c 100644
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -51,7 +51,7 @@ delimited by curly brackets:
 
 @example
 \score @{
-...
+  @dots{}
 @}
 @end example
 
@@ -98,7 +98,7 @@ are music expressions:
 
 Comments are one exception to this general rule.  (For others see
 @ref{File structure}.)  Both single-line comments and comments
-delimited by @code{%@{ .. %@}} may be placed anywhere within an
+delimited by @code{%@{ @dots{} %@}} may be placed anywhere within an
 input file.  They may be placed inside or outside a @code{\score}
 block, and inside or outside the single music expression within a
 @code{\score} block.
@@ -133,7 +133,7 @@ movements.  Each movement is entered with a @code{\score} block,
 
 @example
 \score @{
-  @var{..music..}
+  @var{@dots{}music@dots{}}
 @}
 @end example
 
@@ -141,7 +141,7 @@ and texts are entered with a @code{\markup} block,
 
 @example
 \markup @{
-  @var{..text..}
+  @var{@dots{}text@dots{}}
 @}
 @end example
 
@@ -152,13 +152,13 @@ will normally be typeset in the form of a single output file.
 
 @example
 \score @{
-  @var{..}
+  @var{@dots{}}
 @}
 \markup @{
-  @var{..}
+  @var{@dots{}}
 @}
 \score @{
-  @var{..}
+  @var{@dots{}}
 @}
 @end example
 
@@ -182,10 +182,10 @@ the top of the file is inserted.
   \header @{ piece = "Romanze" @}
 @}
 \markup @{
-   ..text of second verse..
+   @dots{}text of second verse@dots{}
 @}
 \markup @{
-   ..text of third verse..
+   @dots{}text of third verse@dots{}
 @}
 \score @{
   @dots{}
@@ -481,7 +481,7 @@ be entered:
 A single-line comment, introduced by a leading @code{%} sign.
 
 @item
-A multi-line comment delimited by @code{%@{ .. %@}}.
+A multi-line comment delimited by @code{%@{ @dots{} %@}}.
 
 @end itemize
 
@@ -1124,9 +1124,9 @@ markup conditionally to header and footer text defined within the
 
 @example
 @code{variable} = @code{\markup} @{
-  ...
+  @dots{}
   @code{\on-the-fly}  \@var{procedure}  @var{markup}
-  ...
+  @dots{}
 @}
 @end example
 
@@ -1191,7 +1191,7 @@ Several @code{\on-the-fly} conditions can be combined with an
 @example
   @code{\on-the-fly \first-page}
   @code{\on-the-fly \last-page}
-  @code{@{ \markup ... \fromproperty #'header: ... @}}
+  @code{@{ \markup @dots{} \fromproperty #'header: @dots{} @}}
 @end example
 
 determines if the output is a single page.
@@ -1519,7 +1519,7 @@ created in different ways.
 The syntax of a footnote in stand-alone text with automatic marks is
 
 @example
-\markup @{ ... \auto-footnote @var{text} @var{footnote} ... @}
+\markup @{ @dots{} \auto-footnote @var{text} @var{footnote} @dots{} @}
 @end example
 
 The elements are:
@@ -1558,7 +1558,7 @@ For example:
 The syntax of a footnote in stand-alone text with custom marks is
 
 @example
-\markup @{ ... \footnote @var{mark} @var{footnote} ... @}
+\markup @{ @dots{} \footnote @var{mark} @var{footnote} @dots{} @}
 @end example
 
 The elements are:
@@ -1885,7 +1885,7 @@ subdirectory called @file{parts} within the current directory, use
 @example
 \include "parts/VI.ly"
 \include "parts/VII.ly"
-... etc
+@dots{} etc
 @end example
 
 Files which are to be included can also contain @code{\include}
@@ -1919,7 +1919,7 @@ libA/
   libA.ly
   A1.ly
   A2.ly
-  ...
+  @dots{}
 @end example
 
 @noindent
@@ -1929,7 +1929,7 @@ then the entry file, @code{libA.ly}, will contain
 #(ly:set-option 'relative-includes #t)
 \include "A1.ly"
 \include "A2.ly"
-...
+@dots{}
 % return to default setting
 #(ly:set-option 'relative-includes #f)
 @end example
@@ -1959,7 +1959,7 @@ and in main.ly write
 @example
 \include "VI.ly"
 \include "VII.ly"
-... etc
+@dots{} etc
 @end example
 
 Files which are to be included in many scores may be placed in
@@ -2542,7 +2542,7 @@ the last few measures.  This is achieved by putting
 
 @verbatim
 showLastLength = R1*5
-\score { ... }
+\score { @dots{} }
 @end verbatim
 
 @noindent
@@ -2672,7 +2672,7 @@ To create a MIDI output file from a LilyPond input file, add a
 
 @example
 \score @{
-  @var{...music...}
+  @var{@dots{}music@dots{}}
   \midi @{ @}
 @}
 @end example
@@ -2684,7 +2684,7 @@ present.
 
 @example
 \score @{
-  @var{...music...}
+  @var{@dots{}music@dots{}}
   \midi @{ @}
   \layout @{ @}
 @}
@@ -2776,13 +2776,13 @@ The name should be chosen from the list in @ref{MIDI instruments}.
 @example
 \new Staff @{
   \set Staff.midiInstrument = #"glockenspiel"
-  @var{...notes...}
+  @var{@dots{}notes@dots{}}
 @}
 @end example
 
 @example
 \new Staff \with @{midiInstrument = #"cello"@} @{
-  @var{...notes...}
+  @var{@dots{}notes@dots{}}
 @}
 @end example
 
@@ -2804,7 +2804,7 @@ indication to be printed:
 
 @example
 \score @{
-  @var{...music...}
+  @var{@dots{}music@dots{}}
   \midi @{
     \tempo 4 = 72
   @}
@@ -2830,7 +2830,7 @@ from the MIDI output, insert the following lines in the
 
 @example
 \midi @{
-  ...
+  @dots{}
   \context @{
     \Voice
     \remove "Dynamic_performer"
@@ -2961,12 +2961,12 @@ and percent repeats).  For example,
 
 @example
 \score @{
-  @var{..music..}
-  \layout @{ .. @}
+  @var{@dots{}music@dots{}}
+  \layout @{ @dots{} @}
 @}
 \score @{
-  \unfoldRepeats @var{..music..}
-  \midi @{ .. @}
+  \unfoldRepeats @var{@dots{}music@dots{}}
+  \midi @{ @dots{} @}
 @}
 @end example
 
@@ -3282,7 +3282,7 @@ and in the @code{\score} section do
 
 @example
 \unfoldRepeats \articulate <<
-	all the rest of the score...
+	all the rest of the score@dots{}
 >>
 @end example
 
@@ -3394,7 +3394,7 @@ The syntax is a tab-delimited line, with two fixed fields on each
 line followed by optional parameters.
 
 @example
-@var{time}  @var{type}  @var{...params...}
+@var{time}  @var{type}  @var{@dots{}params@dots{}}
 @end example
 
 This information can easily be read into other programs such as
diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely
index 437088c936..5d63184b18 100644
--- a/Documentation/notation/repeats.itely
+++ b/Documentation/notation/repeats.itely
@@ -413,7 +413,7 @@ d4 e f g
 c1
 @end lilypond
 
-@item (volta @var{number}) ... (volta #f)
+@item (volta @var{number}) @dots{} (volta #f)
 Create a new volta with the specified number.  The volta bracket must
 be explicitly terminated, or it will not be printed.
 
diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 50e298dde1..a9acae8e84 100644
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -2317,7 +2317,7 @@ the appearance of beams:
 
 @itemize
 @item
-If a manual beam is specified with @code{[..]} set the beam
+If a manual beam is specified with @code{[@dots{}]} set the beam
 as specified, otherwise
 
 @item
diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely
index 4a02d1faa1..62ce5461ce 100644
--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -414,8 +414,8 @@ A temporary polyphonic passage can be created with the following
 construct:
 
 @example
-<< @{ \voiceOne ... @}
-  \new Voice @{ \voiceTwo ... @}
+<< @{ \voiceOne @dots{} @}
+  \new Voice @{ \voiceTwo @dots{} @}
 >> \oneVoice
 @end example
 
@@ -457,7 +457,7 @@ required to define the settings of each voice.
 
 @subsubsubheading The double backslash construct
 
-The @code{<< @{...@} \\ @{...@} >>} construct, where the two (or
+The @code{<< @{@dots{}@} \\ @{@dots{}@} >>} construct, where the two (or
 more) expressions are separated by double backslashes, behaves
 differently to the similar construct without the double backslashes:
 @emph{all} the expressions within this construct are assigned
@@ -963,7 +963,7 @@ the @code{\partcombine} function considers each note separately. In this
 case the @code{\partcombine} function can be overriden with the
 following commands:
 
-Commands ending in @code{...Once} apply only to the next note in the
+Commands ending in @code{@dots{}Once} apply only to the next note in the
 music expression.
 
 @itemize
@@ -1044,12 +1044,12 @@ Internals Reference:
 @rinternals{Voice}.
 
 @knownissues
-All @code{\partcombine...} functions can only accept two voices and are
+All @code{\partcombine@dots{}} functions can only accept two voices and are
 not designed to work with lyrics; such that when one of the voices is
 explicitly named in order to attach lyrics to it, the partcombiner will
 stop working.
 
-@code{\partcombine...} functions cannot be placed inside a @code{\tuplet}
+@code{\partcombine@dots{}} functions cannot be placed inside a @code{\tuplet}
 or @code{\relative} block.
 
 If @code{printPartCombineTexts} is set and the two voices play the same
-- 
2.39.5