Issue 3404 (partially): Small corrections to the scheme reformatting patch.

This fixes a number of occurences of opening parens in column 0 inside
of strings and thus paves the ground for letting Emacs
indent/highlight Scheme files properly.

diff --git a/scm/bar-line.scm b/scm/bar-line.scm
index e23ff8c0f250f5d5fe92af36442372484ee22350..370f0d476c3dfffb4c4f50ff6db05864773265ef 100644 (file)
--- a/scm/bar-line.scm
+++ b/scm/bar-line.scm
@@ -196,8 +196,8 @@ annotation char from string @var{str}."
 ;; Line break decisions.
 
 (define-public (define-bar-line bar-glyph eol-glyph bol-glyph span-glyph)
 ;; Line break decisions.
 
 (define-public (define-bar-line bar-glyph eol-glyph bol-glyph span-glyph)

-  "Define a bar glyph @var{bar-glyph} and its substitute at the end of a line
-(@var{eol-glyph}), at the beginning of a new line (@var{bol-glyph})
+  "Define a bar glyph @var{bar-glyph} and its substitute at the end of
+a line (@var{eol-glyph}), at the beginning of a new line (@var{bol-glyph})

 and as a span bar (@var{span-glyph}) respectively."
   ;; the last argument may not include annotations
   (check-for-annotation span-glyph)
 and as a span bar (@var{span-glyph}) respectively."
   ;; the last argument may not include annotations
   (check-for-annotation span-glyph)

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 4839493dd708b3877986ad10185ae9558d4e0761..db4e58c9b3f76579930499bf1972345e49994a2f 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -286,8 +286,8 @@ function for clef changes.")
 function for cue clef changes.")
      (explicitKeySignatureVisibility ,vector? "@samp{break-visibility}
 function for explicit key changes.  @samp{\\override} of the
 function for cue clef changes.")
      (explicitKeySignatureVisibility ,vector? "@samp{break-visibility}
 function for explicit key changes.  @samp{\\override} of the

-@code{break-visibility} property will set the visibility for normal
-(i.e., at the start of the line) key signatures.")
+@code{break-visibility} property will set the visibility for
+normal (i.e., at the start of the line) key signatures.")

      (extendersOverRests ,boolean? "Whether to continue extenders as
 they cross a rest.")
      (extraNatural ,boolean? "Whether to typeset an extra natural sign
      (extendersOverRests ,boolean? "Whether to continue extenders as
 they cross a rest.")
      (extraNatural ,boolean? "Whether to typeset an extra natural sign


@@ -359,9 +359,9 @@ the default time signature.")
 @rinternals{Lyrics}.")
      (instrumentCueName ,markup? "The name to print if another
 instrument is to be taken.")
 @rinternals{Lyrics}.")
      (instrumentCueName ,markup? "The name to print if another
 instrument is to be taken.")

-     (instrumentEqualizer ,procedure? "A function taking a string
-(instrument name), and returning a @code{(@var{min} . @var{max})} pair
-of numbers for the loudness range of the instrument.")
+     (instrumentEqualizer ,procedure? "A function taking a
+string (instrument name), and returning a @code{(@var{min} . @var{max})}
+pair of numbers for the loudness range of the instrument.")

      (instrumentName ,markup? "The name to print left of a staff.  The
 @code{instrumentName} property labels the staff in the first system, and
 the @code{shortInstrumentName} property labels following lines.")
      (instrumentName ,markup? "The name to print left of a staff.  The
 @code{instrumentName} property labels the staff in the first system, and
 the @code{shortInstrumentName} property labels following lines.")

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 6434c15c4687cf5f0710d999200985112d1d2f2e..36fa9f0cbbb712e99eedcaeab9f925d680588b90 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -961,8 +961,8 @@ should use @code{LEFT}.")
      (tie-configuration ,list? "List of @code{(@var{position} .
 @var{dir})} pairs, indicating the desired tie configuration, where
 @var{position} is the offset from the center of the staff in staff
      (tie-configuration ,list? "List of @code{(@var{position} .
 @var{dir})} pairs, indicating the desired tie configuration, where
 @var{position} is the offset from the center of the staff in staff

-space and @var{dir} indicates the direction of the tie
-(@code{1}=>up, @w{@code{-1}}=>down, @code{0}=>center).  A non-pair entry
+space and @var{dir} indicates the direction of the tie (@code{1}=>up,
+@w{@code{-1}}=>down, @code{0}=>center).  A non-pair entry

 in the list causes the corresponding tie to be formatted
 automatically.")
      (to-barline ,boolean? "If true, the spanner will stop at the bar
 in the list causes the corresponding tie to be formatted
 automatically.")
      (to-barline ,boolean? "If true, the spanner will stop at the bar

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index ecbe876ffa6e1a88b8f91d53b391cb5141340c7b..9184d6eeba3928d6c242038a13801573289dfb79 100755 (executable)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -3005,8 +3005,8 @@ format require the prefix @code{#x}.
 (define-markup-command (markletter layout props num)
   (integer?)
   #:category other
 (define-markup-command (markletter layout props num)
   (integer?)
   #:category other

-  "Make a markup letter for @var{num}.  The letters start with A to@tie{}Z
-(skipping letter@tie{}I), and continue with double letters.
+  "Make a markup letter for @var{num}.  The letters start with A
+to@tie{}Z (skipping letter@tie{}I), and continue with double letters.

 
 @lilypond[verbatim,quote]
 \\markup {
 
 @lilypond[verbatim,quote]
 \\markup {

diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index dbad0cf0923abadc86445777fe273775b3a5d68d..9387294636c793d83a9d04c1e989af2431685ff9 100644 (file)
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -41,10 +41,10 @@ TODO: Consider making type into symbol.")
                    "Articulation events specifically for this note.")
      (associated-context ,string? "Name of the Voice context associated with
 this @code{\\lyricsto} section.")
                    "Articulation events specifically for this note.")
      (associated-context ,string? "Name of the Voice context associated with
 this @code{\\lyricsto} section.")

-     (augmented ,boolean? "This figure is for an augmented figured bass
-(with @code{+} sign).")
-     (augmented-slash ,boolean? "This figure is for an augmented figured bass
-(back-slashed number).")
+     (augmented ,boolean? "This figure is for an augmented figured
+bass (with @code{+} sign).")
+     (augmented-slash ,boolean? "This figure is for an augmented
+figured bass (back-slashed number).")

      (automatically-numbered ,boolean? "Should a footnote be automatically
 numbered?")
      (autosplit-end ,boolean? "Duration of event was truncated by automatic
      (automatically-numbered ,boolean? "Should a footnote be automatically
 numbered?")
      (autosplit-end ,boolean? "Duration of event was truncated by automatic


@@ -179,8 +179,8 @@ If zero, signals a beat containing varying durations.")
      (span-direction ,ly:dir? "Does this start or stop a spanner?")
      (span-type ,symbol? "What kind of dynamic spanner should be created?
 Options are @code{'text} and @code{'hairpin}.")
      (span-direction ,ly:dir? "Does this start or stop a spanner?")
      (span-type ,symbol? "What kind of dynamic spanner should be created?
 Options are @code{'text} and @code{'hairpin}.")

-     (span-text ,markup? "The displayed text for dynamic text spanners
-(e.g., cresc.)")
+     (span-text ,markup? "The displayed text for dynamic text
+spanners (e.g., cresc.)")

      (spanner-id ,string? "Identifier to distinguish concurrent spanners.")
      (split-list ,list? "Splitting moments for part combiner.")
      (start-callback ,procedure? "Function to compute the negative length
      (spanner-id ,string? "Identifier to distinguish concurrent spanners.")
      (split-list ,list? "Splitting moments for part combiner.")
      (start-callback ,procedure? "Function to compute the negative length

diff --git a/scm/flag-styles.scm b/scm/flag-styles.scm
index 6027161995cb2268f535f975fc7ac9a24fe77334..e8c9a1483cc6098b1bd50b7598da04f3759735aa 100644 (file)
--- a/scm/flag-styles.scm
+++ b/scm/flag-styles.scm
@@ -33,8 +33,8 @@
                                     offset length thickness stroke-thickness)
   "Add the stroke for acciaccatura to the given flag stencil.
 The stroke starts for up-flags at `upper-end-of-flag + (0,length/2)'
                                     offset length thickness stroke-thickness)
   "Add the stroke for acciaccatura to the given flag stencil.
 The stroke starts for up-flags at `upper-end-of-flag + (0,length/2)'

-and ends at `(0, vertical-center-of-flag-end) -
-(flag-x-width/2, flag-x-width + flag-thickness)'.  Here `length' is the
+and ends at `(0, vertical-center-of-flag-end) - (flag-x-width/2,
+flag-x-width + flag-thickness)'.  Here `length' is the

 whole length, while `flag-x-width' is just the x-extent and thus depends on
 the angle!  Other combinations don't look as good.
 
 whole length, while `flag-x-width' is just the x-extent and thus depends on
 the angle!  Other combinations don't look as good.
 

diff --git a/scm/harp-pedals.scm b/scm/harp-pedals.scm
index 66f342c0cdfcf3c50557ff23d7d481978164d5ef..c2cfd499910d6527f748f8990aa12ccb14073cc0 100644 (file)
--- a/scm/harp-pedals.scm
+++ b/scm/harp-pedals.scm
@@ -42,21 +42,23 @@ the following pedal should be circled (indicating a change)
 The function also checks if the string has the typical form of three
 pedals, then the divider and then the remaining four pedals.  If not it
 prints out a warning.  However, in any case, it will also print each symbol
 The function also checks if the string has the typical form of three
 pedals, then the divider and then the remaining four pedals.  If not it
 prints out a warning.  However, in any case, it will also print each symbol

-in the order as given.  This means you can place the divider
-(even multiple dividers) anywhere you want, but you'll have to live with the warnings.
+in the order as given.  This means you can place the divider (even
+multiple dividers) anywhere you want, but you'll have to live with the
+warnings.

 
 The appearance of the diagram can be tweaked inter alia using the size property
 of the TextScript grob (@code{\\override Voice.TextScript #'size = #0.3}) for
 
 The appearance of the diagram can be tweaked inter alia using the size property
 of the TextScript grob (@code{\\override Voice.TextScript #'size = #0.3}) for

-the overall, the thickness property
-(@code{\\override Voice.TextScript #'thickness = #3}) for the line thickness of
-the horizontal line and the divider.  The remaining configuration
-(box sizes, offsets and spaces) is done by the harp-pedal-details list of properties
-(@code{\\override Voice.TextScript #'harp-pedal-details #'box-width = #1}).
-It contains the following settings: @code{box-offset}
-(vertical shift of the box center for up/down pedals),
-@code{box-width}, @code{box-height}, @code{space-before-divider}
-(the spacing between two boxes before the divider) and
-@code{space-after-divider} (box spacing after the divider).
+the overall, the thickness property (@code{\\override Voice.TextScript
+#'thickness = #3}) for the line thickness of
+the horizontal line and the divider.  The remaining configuration (box
+sizes, offsets and spaces) is done by the harp-pedal-details list of
+properties (@code{\\override Voice.TextScript #'harp-pedal-details
+#'box-width = #1}).
+It contains the following settings: @code{box-offset} (vertical shift
+of the box center for up/down pedals), @code{box-width},
+@code{box-height}, @code{space-before-divider} (the spacing between
+two boxes before the divider) and @code{space-after-divider} (box
+spacing after the divider).

 
 @lilypond[verbatim,quote]
 \\markup \\harp-pedal #\"^-v|--ov^\"
 
 @lilypond[verbatim,quote]
 \\markup \\harp-pedal #\"^-v|--ov^\"

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 48ee33cf50f20be5dca07da805bfa6e2d7d28dcf..f9bcdc6ecf2f2df436eb149b8458f14be990677d 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -100,9 +100,9 @@ the numeric factor by which they increase the duration."
   (- 2 (/ (ash 1 dotcount))))
 
 (define-public (duration-length dur)
   (- 2 (/ (ash 1 dotcount))))
 
 (define-public (duration-length dur)

-"Return the overall length of a duration, as a number of whole notes.
-(Not to be confused with ly:duration-length, which returns a less-useful
-moment object.)"
+"Return the overall length of a duration, as a number of whole
+notes.  (Not to be confused with ly:duration-length, which returns a
+less-useful moment object.)"

   (ly:moment-main (ly:duration-length dur)))
 
 (define-public (duration-visual dur)
   (ly:moment-main (ly:duration-length dur)))
 
 (define-public (duration-visual dur)

diff --git a/scm/lily.scm b/scm/lily.scm
index 2028f1c20e652df058c538fd796f4051d0a45dc2..a479cd831ccea69eae015cf75a2244ac41a99ce1 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -169,8 +169,8 @@ variables to their value after the initial call of @var{thunk}."
     ;; be longer than 48 characters per line.
 
     (anti-alias-factor 1
     ;; be longer than 48 characters per line.
 
     (anti-alias-factor 1

-"Render at higher resolution
-(using given factor) and scale down result to prevent jaggies in
+"Render at higher resolution (using given factor)
+and scale down result to prevent jaggies in

 PNG images.")
     (aux-files
       #t
 PNG images.")
     (aux-files
       #t


@@ -309,8 +309,8 @@ input files to be processed.")
     (relative-includes
       #f
 "When processing an \\include command, look for
     (relative-includes
       #f
 "When processing an \\include command, look for

-the included file relative to the current file
-(instead of the root file)")
+the included file relative to the current file\
+\n(instead of the root file)")

     (safe
       #f
 "Run in safer mode.")
     (safe
       #f
 "Run in safer mode.")

diff --git a/scm/stencil.scm b/scm/stencil.scm
index d492f17a1cfd8323ddfa301d216218382567dfc9..94523da7f09fa489c2e80b38df231bdece90d2bc 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -236,9 +236,9 @@ be connected to the start by a line.
   (define (make-radius-list x-radius y-radius)
     "Makes a list of angle/radius pairs at intervals of PI/2 for
 the partial ellipse until 7*PI/2.  For example, in pseudo-code:
   (define (make-radius-list x-radius y-radius)
     "Makes a list of angle/radius pairs at intervals of PI/2 for
 the partial ellipse until 7*PI/2.  For example, in pseudo-code:

-> (make-radius-list 2 3)
-((0.0 . 2) (PI/2 . 3) (PI . -2) (3*PI/2 . -3)
-(2*PI . 2) (5*PI/2 . 3) (3*PI . -2) (7*PI/2 . -3))
+> (make-radius-list 2 3)\
+\n((0.0 . 2) (PI/2 . 3) (PI . -2) (3*PI/2 . -3)\
+\n(2*PI . 2) (5*PI/2 . 3) (3*PI . -2) (7*PI/2 . -3))

 "
     (apply append
            (map (lambda (adder)
 "
     (apply append
            (map (lambda (adder)