From a75190dd0a48ac1a8e436cd9867542f4774af36b Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Fri, 20 Sep 2013 20:21:22 -0700 Subject: [PATCH] Issue 3557: Fix some grammar mistakes. This also removes excess spaces at line ends in the affected files. --- Documentation/de/notation/ancient.itely | 6 +++--- Documentation/essay/computer-notation.bib | 2 +- Documentation/essay/engravingbib.bib | 2 +- Documentation/fr/notation/ancient.itely | 12 ++++++------ Documentation/learning/fundamental.itely | 2 +- Documentation/learning/tweaks.itely | 2 +- Documentation/misc/CHANGES-1.3 | 2 +- Documentation/music-glossary.tely | 4 ++-- Documentation/nl/learning/fundamental.itely | 2 +- Documentation/nl/learning/tweaks.itely | 2 +- Documentation/notation/ancient.itely | 2 +- lily/dynamic-engraver.cc | 2 +- lily/include/context-def.hh | 2 +- lily/include/event-chord-iterator.hh | 2 +- lily/include/performer.hh | 2 +- lily/item.cc | 2 +- lily/staff-spacing.cc | 2 +- lily/vaticana-ligature-engraver.cc | 4 ++-- scm/bar-line.scm | 2 +- scm/define-markup-commands.scm | 2 +- scm/define-music-properties.scm | 4 ++-- scm/define-music-types.scm | 2 +- scm/guile-debugger.scm | 2 +- scm/music-functions.scm | 2 +- scm/translation-functions.scm | 2 +- 25 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Documentation/de/notation/ancient.itely b/Documentation/de/notation/ancient.itely index 4110837698..f5f2869cfb 100644 --- a/Documentation/de/notation/ancient.itely +++ b/Documentation/de/notation/ancient.itely @@ -259,7 +259,7 @@ erklärt in @ref{Weiße Mensuralligaturen} und @seealso Glossar: @rglos{ligature}. - + Notationsreferenz: @ref{Weiße Mensuralligaturen}, @ref{Ligaturen der gregorianischen Quadratnotation}. @@ -2493,7 +2493,7 @@ augmentum-Punkte hinzuzufügen. @seealso Glossar: @rglos{ligature}. - + Notationreferenz: @ref{ Ligaturen der gregorianischen Quadratnotation}, @ref{Weiße Mensuralligaturen}, @@ -2956,7 +2956,7 @@ In Arbeit. @c try Till Rettig @c Add example of white noteheads: @c In the french baroque some composers used white noteheads in slow pieces, -@c mainly in 3/2-time. A quarter looks there like a eighth with a white +@c mainly in 3/2-time. A quarter looks there like an eighth with a white @c notehead. (Franz-Rudolf Kuhnen) @c TODO Add example of this: diff --git a/Documentation/essay/computer-notation.bib b/Documentation/essay/computer-notation.bib index 23b0658066..b4d7e1984e 100644 --- a/Documentation/essay/computer-notation.bib +++ b/Documentation/essay/computer-notation.bib @@ -229,7 +229,7 @@ for Adequately Representing Score-level Music}, } @Article{blostein91, - note = {This paper provides a overview of the algorithm used in LIME + note = {This paper provides an overview of the algorithm used in LIME for spacing individual lines. HWN}, year = {1991}, title = {Justification of Printed Music}, diff --git a/Documentation/essay/engravingbib.bib b/Documentation/essay/engravingbib.bib index f419af4e65..ecbddcbe35 100644 --- a/Documentation/essay/engravingbib.bib +++ b/Documentation/essay/engravingbib.bib @@ -91,7 +91,7 @@ reference work for music notation issues as one is likely to get.}, @Book{wanske88, annote = {I. A very thorough overview of engraving practices of various craftsmen. It includes detailed specs of characters, dimensions -etc. II. a thorough overview of a anonymous (by now antiquated) +etc. II. a thorough overview of an anonymous (by now antiquated) automated system. EDV Means e(lektronischen) D(aten)v(erarbeitung), electronic data processing HWN.}, year = {1988}, diff --git a/Documentation/fr/notation/ancient.itely b/Documentation/fr/notation/ancient.itely index cfbb809dd2..52d22bc8da 100644 --- a/Documentation/fr/notation/ancient.itely +++ b/Documentation/fr/notation/ancient.itely @@ -245,7 +245,7 @@ style de ligature désiré, il faut remplacer, dans le contexte @code{Voice} approprié, le graveur @code{Ligature_bracket_engraver} par le graveur de ligature qui convient -- voir les rubriques @ref{Ligatures mensurales} et @ref{Neumes et ligatures grégoriennes} à -ce sujet. +ce sujet. @seealso Glossaire musicologique : @@ -428,7 +428,7 @@ clés utilisent le même glyphe, attaché à l'une ou l'autre des lignes de la portée. Le chiffre porté en suffixe permet alors de les différencier. Vous pouvez forcer le positionnement du glyphe sur une ligne, comme expliqué à la section @ref{Clefs}. Dans la colonne -exemple, la note suivant la clé est un do médium. +exemple, la note suivant la clé est un do médium. Les clés d'ut de Petrucci avaient une hampe gauche différente selon leur ligne de rattachement. @@ -652,7 +652,7 @@ Voici les différences entre les styles : @end lilypond La rubrique @ref{Métrique} expose les principes généraux sur -l'utilisation des indications de métrique. +l'utilisation des indications de métrique. @seealso Glossaire musicologique : @@ -692,7 +692,7 @@ commande @code{\time}. Utilisez alors un Pour de la musique ancienne, vous disposez de plusieurs styles de tête de note, en plus du style par défaut @code{default}. Vous pouvez affecter à la propriété @code{style} de l'objet @code{NoteHead} -les valeurs @code{baroque}, @code{neomensural}, @code{mensural}, +les valeurs @code{baroque}, @code{neomensural}, @code{mensural}, @code{petrucci}, @code{blackpetrucci} ou @code{semipetrucci}. Le style @code{baroque} diffère du style @code{default} par @@ -2679,7 +2679,7 @@ Manuel de notation : @knownissues L'espacement des ligatures n'est pas des meilleurs. - + @node Réédition de musique ancienne @subsection Réédition de musique ancienne @@ -2955,7 +2955,7 @@ spirLyr = \lyricmode { @c try Till Rettig @c Add example of white note heads: @c In the french baroque some composers used white note heads in slow pieces, -@c mainly in 3/2-time. A quarter looks there like a eighth with a white +@c mainly in 3/2-time. A quarter looks there like an eighth with a white @c note head. (Franz-Rudolf Kuhnen) @c TODO Add example of this: diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely index 380bc500de..bd08657bc8 100644 --- a/Documentation/learning/fundamental.itely +++ b/Documentation/learning/fundamental.itely @@ -1895,7 +1895,7 @@ The statement which sets the property value is the same as that in a @code{\context} block within a @code{\layout} block. Each @code{\context} block will affect all contexts of the type specified throughout the @code{\score} or @code{\book} block in which the -@code{\layout} block appears. Here is a example to show the format: +@code{\layout} block appears. Here is an example to show the format: @lilypond[verbatim,quote] \score { diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely index 207421fe11..fdb9008721 100644 --- a/Documentation/learning/tweaks.itely +++ b/Documentation/learning/tweaks.itely @@ -1117,7 +1117,7 @@ will cause errors when the dimensions of the object are required for correct processing. For example, errors will be generated if the @code{stencil} property of the @code{NoteHead} object is set to @code{#f}. If this is the case, you can instead use the -@code{point-stencil} function, which sets the stencil to a object +@code{point-stencil} function, which sets the stencil to an object with zero size: @lilypond[quote,verbatim,relative=2] diff --git a/Documentation/misc/CHANGES-1.3 b/Documentation/misc/CHANGES-1.3 index d6ba0bfc9f..466a67d2d4 100644 --- a/Documentation/misc/CHANGES-1.3 +++ b/Documentation/misc/CHANGES-1.3 @@ -3343,7 +3343,7 @@ item for hard constraints. handle_broken_smobs (); should conserve a little memory. * Fixed handling of orphaned score-elements. Any element that does -not have its Line_of_score as a ancestor in both directions, is silently +not have its Line_of_score as an ancestor in both directions, is silently removed from the output. This guarantees that programming errors don't result in coredumps from Dimension_cache::common_refpoint (): element->line_l () is always a common reference point. diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely index fba2e58da8..7d198504b7 100644 --- a/Documentation/music-glossary.tely +++ b/Documentation/music-glossary.tely @@ -2908,7 +2908,7 @@ DK: ?, S: ?, FI: nousu. -Indicator for a indeterminately rising pitch bend. Compare with +Indicator for an indeterminately rising pitch bend. Compare with @emph{glissando}, which has determinate starting and ending pitches. @seealso @@ -3527,7 +3527,7 @@ DK: ?, S: ?, FI: lasku. -Indicator for a indeterminately falling pitch bend. Compare with +Indicator for an indeterminately falling pitch bend. Compare with @emph{glissando}, which has determinate starting and ending pitches. @seealso diff --git a/Documentation/nl/learning/fundamental.itely b/Documentation/nl/learning/fundamental.itely index 8532ee4dcb..2589572db4 100644 --- a/Documentation/nl/learning/fundamental.itely +++ b/Documentation/nl/learning/fundamental.itely @@ -1920,7 +1920,7 @@ The statement which sets the property value is the same as that in a @code{\context} block within a @code{\layout} block. Each @code{\context} block will affect all contexts of the type specified throughout the @code{\score} or @code{\book} block in which the -@code{\layout} block appears. Here is a example to show the format: +@code{\layout} block appears. Here is an example to show the format: @lilypond[verbatim,quote] \score { diff --git a/Documentation/nl/learning/tweaks.itely b/Documentation/nl/learning/tweaks.itely index 99fa03cce0..80881daf55 100644 --- a/Documentation/nl/learning/tweaks.itely +++ b/Documentation/nl/learning/tweaks.itely @@ -1099,7 +1099,7 @@ will cause errors when the dimensions of the object are required for correct processing. For example, errors will be generated if the @code{stencil} property of the @code{NoteHead} object is set to @code{#f}. If this is the case, you can instead use the -@code{point-stencil} function, which sets the stencil to a object +@code{point-stencil} function, which sets the stencil to an object with zero size: @lilypond[quote,verbatim,relative=2] diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely index 2ffb0042fc..485346a2f3 100644 --- a/Documentation/notation/ancient.itely +++ b/Documentation/notation/ancient.itely @@ -2879,7 +2879,7 @@ TBC @c try Till Rettig @c Add example of white note heads: @c In the french baroque some composers used white note heads in slow pieces, -@c mainly in 3/2-time. A quarter looks there like a eighth with a white +@c mainly in 3/2-time. A quarter looks there like an eighth with a white @c note head. (Franz-Rudolf Kuhnen) @c TODO Add example of this: diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index c492e59c55..0a718f8f02 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -380,7 +380,7 @@ Dynamic_engraver::typeset_all () else if (!r && !l) { /* - This is a isolated dynamic apparently, and does not even have + This is an isolated dynamic apparently, and does not even have any interesting support item. */ Grob *cc = unsmob_grob (get_property ("currentMusicalColumn")); diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh index 2fddd980b7..2776c81105 100644 --- a/lily/include/context-def.hh +++ b/lily/include/context-def.hh @@ -28,7 +28,7 @@ #include /* - The definition of a interpretation context as given in the + The definition of an interpretation context as given in the input. The lists are stored in order of definition. */ struct Context_def diff --git a/lily/include/event-chord-iterator.hh b/lily/include/event-chord-iterator.hh index aaecc3d923..04168f4209 100644 --- a/lily/include/event-chord-iterator.hh +++ b/lily/include/event-chord-iterator.hh @@ -23,7 +23,7 @@ #include "simple-music-iterator.hh" /** - Walk through a Event_chord + Walk through an Event_chord */ class Event_chord_iterator : public Simple_music_iterator { diff --git a/lily/include/performer.hh b/lily/include/performer.hh index 0e6729a81f..1601625690 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -25,7 +25,7 @@ #include "grob-info.hh" #include "translator.hh" -/* Convert a music definition into a audio representation. +/* Convert a music definition into an audio representation. A baseclass. */ class Performer : public Translator { diff --git a/lily/item.cc b/lily/item.cc index 9941bc13c2..9cc808dde4 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -43,7 +43,7 @@ Item::Item (SCM s) } /** - Item copy ctor. Copy nothing: everything should be a elt property + Item copy ctor. Copy nothing: everything should be an elt property or a special purpose pointer (such as broken_to_drul_[]) */ Item::Item (Item const &s) : Grob (s) diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 49f42ea4a6..e8bedd2e70 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -129,7 +129,7 @@ Staff_spacing::get_spacing (Grob *me, Grob *right_col, Real situational_space) /* TODO: - Should insert a adjustable space here? For excercises, you might want to + Should insert an adjustable space here? For exercises, you might want to use a staff without a clef in the beginning. */ diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 2372b511f2..9b1485777c 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -166,7 +166,7 @@ Vaticana_ligature_engraver::need_extra_horizontal_space (int prev_prefix_set, in { if (prev_prefix_set & VIRGA) /* - * After a virga, make a an additional small space such that the + * After a virga, make an additional small space such that the * appendix on the right side of the head does not touch the * following head. */ @@ -181,7 +181,7 @@ Vaticana_ligature_engraver::need_extra_horizontal_space (int prev_prefix_set, in if ((context_info & FLEXA_LEFT) && ! (context_info & PES_UPPER)) /* - * Before a flexa (but not within a torculus), make a an + * Before a flexa (but not within a torculus), make an * additional small space such that the appendix on the left side * of the flexa does not touch the this head. */ diff --git a/scm/bar-line.scm b/scm/bar-line.scm index b432386372..fedd21be9a 100644 --- a/scm/bar-line.scm +++ b/scm/bar-line.scm @@ -801,7 +801,7 @@ no elements." ;; the size of the staff lines is evaluated as 0, which results in a ;; solid span bar line with faulty y coordinate. ;; -;; This routine was originally by Juergen Reuter, but it was a on the +;; This routine was originally by Juergen Reuter, but it was on the ;; bulky side. Rewritten by Han-Wen. Ported from c++ to Scheme by Marc Hohl. (define-public (ly:span-bar::print grob) "The print routine for span bars." diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 88d33ecda9..be87af5191 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -418,7 +418,7 @@ line thickness and padding around the markup. " @cindex drawing oval around text -Draw a oval around @var{arg}. Use @code{thickness}, +Draw an oval around @var{arg}. Use @code{thickness}, @code{x-padding}, @code{x-padding} and @code{font-size} properties to determine line thickness and padding around the markup. diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm index 4082cc4902..5c9c12538e 100644 --- a/scm/define-music-properties.scm +++ b/scm/define-music-properties.scm @@ -28,7 +28,7 @@ (lambda (x) (apply music-property-description x)) `( (absolute-octave ,integer? - "The absolute octave for a octave check note.") + "The absolute octave for an octave check note.") (alteration ,number? "Alteration for figured bass.") (alternative-dir ,ly:dir? "Indicates if an AlternativeMusic is the First (-1), Middle (0), or Last (1) of group of alternate endings.") @@ -148,7 +148,7 @@ Options are @code{solo1}, @code{solo2} and @code{unisono}.") (pitch ,ly:pitch? "The pitch of this note.") (pitch-alist ,list? "A list of pitches jointly forming the scale of a key signature.") - (pop-first ,boolean? "Do a revert before we try to do a override + (pop-first ,boolean? "Do a revert before we try to do an override on some grob property.") (prob-property ,symbol? "The symbol of the prob property to set.") (procedure ,procedure? "The function to run with @code{\\applycontext}. diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 0a796a1981..a39ad23002 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -33,7 +33,7 @@ Syntax: @var{note}@code{\\x}, where @code{\\x} is a dynamic mark like )) (AlternativeEvent - . ((description . "Create a alternative event.") + . ((description . "Create an alternative event.") (types . (general-music event alternative-event)) )) diff --git a/scm/guile-debugger.scm b/scm/guile-debugger.scm index be77f2a48f..defd663317 100644 --- a/scm/guile-debugger.scm +++ b/scm/guile-debugger.scm @@ -18,7 +18,7 @@ ;;; Commentary: ;;; This file provides the support routines for a guile debugger called -;;; from a environment controlled by LilyPond. It works in conjunction +;;; from an environment controlled by LilyPond. It works in conjunction ;;; with file guile-debugger.ly. ;;; Code: diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 092cf84e4b..7819c574c6 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -980,7 +980,7 @@ result." pred)) (cons type signature))) (if (and (pair? body) (pair? (car body)) (eqv? '_i (caar body))) - ;; When the music function definition contains a i10n doc string, + ;; When the music function definition contains an i10n doc string, ;; (_i "doc string"), keep the literal string only (let ((docstring (cadar body)) (body (cdr body))) diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm index 5d40da8cfa..823668830a 100644 --- a/scm/translation-functions.scm +++ b/scm/translation-functions.scm @@ -582,7 +582,7 @@ only ~a fret labels provided") (make-vcenter-markup (format #f "~a" fret-number))) -;; The 5-string banjo has got a extra string, the fifth (duh), which +;; The 5-string banjo has got an extra string, the fifth (duh), which ;; starts at the fifth fret on the neck. Frets on the fifth string ;; are referred to relative to the other frets: ;; the "first fret" on the fifth string is really the sixth fret -- 2.39.2