From 83f3215e14739700fb7ca78a0e9320d82fea3bf8 Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Wed, 17 Feb 2010 08:55:07 -0800 Subject: [PATCH] Fix doubled words; whitespace. --- .../regression/identifier-following-chordmode.ly | 2 +- input/regression/music-map.ly | 6 +++--- lily/accidental-engraver.cc | 14 +++++++------- lily/bar-line.cc | 10 +++++----- lily/context-def.cc | 6 +++--- lily/context-property.cc | 16 ++++++++-------- lily/open-type-font-scheme.cc | 2 +- lily/prob.cc | 14 +++++++------- lily/staff-symbol-referencer-scheme.cc | 2 +- ly/predefined-guitar-ninth-fretboards.ly | 2 +- mf/feta-numbers.mf | 2 +- mf/feta-params.mf | 14 +++++++------- python/musicexp.py | 2 +- 13 files changed, 46 insertions(+), 46 deletions(-) diff --git a/input/regression/identifier-following-chordmode.ly b/input/regression/identifier-following-chordmode.ly index 34dec04102..835f34abf0 100644 --- a/input/regression/identifier-following-chordmode.ly +++ b/input/regression/identifier-following-chordmode.ly @@ -2,7 +2,7 @@ texidoc = "Identifiers following a chordmode section are not interpreted as chordmode tokens. In the following snippet, the -identifier `m' is not interpreted by the lexer as as a minor chord +identifier `m' is not interpreted by the lexer as a minor chord modifier." } diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 661dc03511..a427bdf742 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -4,7 +4,7 @@ "With @code{music-map}, you can apply functions operating on a single piece of music to an entire music expression. In this example, -the the function @code{notes-to-skip} changes a note to a skip. When +the function @code{notes-to-skip} changes a note to a skip. When applied to an entire music expression in the 1st measure, the scripts and dynamics are left over. These are put onto the 2nd measure." @@ -29,7 +29,7 @@ Scripts and dynamics are maintained. \layout { ragged-right= ##t } -foobar = \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^ } +foobar = \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^ } \relative c'' \context Voice { @@ -37,5 +37,5 @@ foobar = \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^ } << \applyMusic #(lambda (x) (music-map notes-to-skip x)) \foobar - { d8 d d d d d d d } >> + { d8 d d d d d d d } >> } diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index b9cd0832a9..817da93c97 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -80,7 +80,7 @@ protected: void stop_translation_timestep (); void process_acknowledged (); - + virtual void finalize (); virtual void derived_mark () const; @@ -245,8 +245,8 @@ Accidental_engraver::process_acknowledged () bool cautionary = to_boolean (note->get_property ("cautionary")); if (caut.score () > acc.score ()) { - acc.need_acc |= caut.need_acc; - acc.need_restore |= caut.need_restore; + acc.need_acc |= caut.need_acc; + acc.need_restore |= caut.need_restore; cautionary = true; } @@ -261,7 +261,7 @@ Accidental_engraver::process_acknowledged () */ if (!note->in_event_class ("trill-span-event")) { - if (acc.need_acc) + if (acc.need_acc) create_accidental (&accidentals_[i], acc.need_restore, cautionary); if (forced || cautionary) @@ -332,7 +332,7 @@ Accidental_engraver::make_standard_accidental (Stream_event * /* note */, Accidental_placement::add_accidental (accidental_placement_, a); note_head->set_object ("accidental-grob", a->self_scm ()); - + return a; } @@ -377,7 +377,7 @@ Accidental_engraver::stop_translation_timestep () } for (vsize i = accidentals_.size (); i--;) - { + { Stream_event *note = accidentals_[i].melodic_; Context *origin = accidentals_[i].origin_; @@ -415,7 +415,7 @@ Accidental_engraver::stop_translation_timestep () else { /* - not really really correct if there is more than one + not really correct if there is more than one note head with the same notename. */ localsig = ly_assoc_prepend_x (localsig, key, diff --git a/lily/bar-line.cc b/lily/bar-line.cc index ba0e14c296..503420b7b3 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -60,7 +60,7 @@ Bar_line::print (SCM smob) SCM s = me->get_property ("glyph-name"); SCM barsize = me->get_property ("bar-size"); - + if (scm_is_string (s) && scm_is_number (barsize)) { string str = ly_scm2string (s); @@ -284,12 +284,12 @@ Bar_line::dashed_bar_line (Grob *me, Real h, Real thick) if (fabs (line_thick + (count -1) * ss - h) < 0.1) // ugh. { - Real blot = + Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); Real half_space = ss/2; Stencil bar; - + for (int i = (count-1); i >= -(count-1); i -= 2) { Real top_y = min ((i + dash_size) * half_space, @@ -312,7 +312,7 @@ Bar_line::dashed_bar_line (Grob *me, Real h, Real thick) int dashes = int (rint (h / ss)); Real total_dash_size = h / dashes; Real factor = (dash_size - thick) / ss; - + SCM at = scm_list_n (ly_symbol2scm ("dashed-line"), scm_from_double (thick), scm_from_double (factor * total_dash_size), @@ -375,7 +375,7 @@ ADD_INTERFACE (Bar_line, " a thick double repeat, a thin-thick-thin double repeat," " a thin-thick double repeat, a thick bar, a double bar, a start bar," " an end bar, a thick double bar, a thin-thick-thin bar," - " a dotted bar, a dashed bar and a tick as bar bar line." + " a dotted bar, a dashed bar, and a tick." " In addition, there is an option" " @code{||:} which is equivalent to @code{|:} except at line" " breaks, where it produces a double bar (@code{||}) at the" diff --git a/lily/context-def.cc b/lily/context-def.cc index a68b6f05e5..5c76926746 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -66,7 +66,7 @@ Context_def::Context_def (Context_def const &s) smobify_self (); description_ = s.description_; - input_location_ = make_input (*s.origin ()); + input_location_ = make_input (*s.origin ()); default_child_ = s.default_child_; accept_mods_ = s.accept_mods_; property_ops_ = s.property_ops_; @@ -99,7 +99,7 @@ SCM Context_def::mark_smob (SCM smob) { ASSERT_LIVE_IS_ALLOWED (); - + Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob); scm_gc_mark (me->description_); @@ -205,7 +205,7 @@ Context_def::get_default_child (SCM user_mod) const - the first element in the list defines a context that is a valid child of the context defined by this Context_def - each subsequent element in the list defines a context that is a valid child - of the the context defined by the preceding element in the list + of the context defined by the preceding element in the list - the last element in the list defines a context with the given name The ADDITIONAL_ACCEPTS parameter is a list of additional contexts that this diff --git a/lily/context-property.cc b/lily/context-property.cc index fd57fcd1f3..eb05a1e9aa 100644 --- a/lily/context-property.cc +++ b/lily/context-property.cc @@ -55,10 +55,10 @@ general_pushpop_property (Context *context, alist defined in a parent context. BASED-ON should always be a tail of ALIST. - Push or pop (depending on value of VAL) a single entry entry from a + Push or pop (depending on value of VAL) a single entry from a translator property list by name of PROP. GROB_PROPERTY_PATH indicates nested alists, eg. '(beamed-stem-lengths details) - + */ void execute_override_property (Context *context, @@ -67,7 +67,7 @@ execute_override_property (Context *context, SCM new_value) { SCM current_context_val = SCM_EOL; - + Context *where = context->where_defined (context_property, ¤t_context_val); @@ -95,7 +95,7 @@ execute_override_property (Context *context, SCM symbol = scm_car (grob_property_path); if (scm_is_pair (scm_cdr (grob_property_path))) { - new_value = nested_property_alist (ly_assoc_get (symbol, target_alist, + new_value = nested_property_alist (ly_assoc_get (symbol, target_alist, SCM_EOL), scm_cdr (grob_property_path), new_value); @@ -163,7 +163,7 @@ execute_revert_property (Context *context, programming_error ("Grob property path should be list of symbols."); return; } - + SCM symbol = scm_car (grob_property_path); if (scm_is_pair (scm_cdr (grob_property_path))) { @@ -171,7 +171,7 @@ execute_revert_property (Context *context, SCM new_val = nested_property_revert_alist (current_sub_alist, scm_cdr (grob_property_path)); - + if (scm_is_pair (current_alist) && scm_caar (current_alist) == symbol && current_alist != daddy) @@ -183,7 +183,7 @@ execute_revert_property (Context *context, else { SCM new_alist = evict_from_alist (symbol, current_alist, daddy); - + if (new_alist == daddy) context->unset_property (context_property); else @@ -206,7 +206,7 @@ execute_pushpop_property (Context *context, scm_list_1 (grob_property), new_value); } - + /* PRE_INIT_OPS is in the order specified, and hence must be reversed. */ diff --git a/lily/open-type-font-scheme.cc b/lily/open-type-font-scheme.cc index 7fdecf38bf..8132e92375 100644 --- a/lily/open-type-font-scheme.cc +++ b/lily/open-type-font-scheme.cc @@ -88,7 +88,7 @@ LY_DEFINE (ly_otf_font_p, "ly:otf-font?", 1, 0, 0, LY_DEFINE (ly_otf_glyph_count, "ly:otf-glyph-count", 1, 0, 0, (SCM font), - "Return the the number of glyphs in @var{font}.") + "Return the number of glyphs in @var{font}.") { Modified_font_metric *fm = dynamic_cast (unsmob_metrics (font)); diff --git a/lily/prob.cc b/lily/prob.cc index e0bc2a7109..5944f93a7f 100644 --- a/lily/prob.cc +++ b/lily/prob.cc @@ -35,7 +35,7 @@ Prob::equal_p (SCM sa, SCM sb) constructor preserve equality. Perhaps it would be better to use a more strict definition of - equality; e.g., that that two probs are equal iff they can be + equality; e.g., that two probs are equal iff they can be distinguished by calls to ly:prob-property. */ Prob *probs[2] = {unsmob_prob (sa), unsmob_prob (sb)}; @@ -66,7 +66,7 @@ Prob::equal_p (SCM sa, SCM sb) if (scm_caar (aprop) != scm_caar (bprop) || ( !(unsmob_input (aval) && unsmob_input (bval)) - && + && !to_boolean (scm_equal_p (aval, bval)))) return SCM_BOOL_F; } @@ -123,11 +123,11 @@ SCM Prob::mark_smob (SCM smob) { ASSERT_LIVE_IS_ALLOWED (); - + Prob *system = (Prob *) SCM_CELL_WORD_1 (smob); scm_gc_mark (system->mutable_property_alist_); system->derived_mark (); - + return system->immutable_property_alist_; } @@ -142,7 +142,7 @@ Prob::print_smob (SCM smob, SCM port, scm_print_state*) scm_puts (p->class_name (), port); scm_display (p->mutable_property_alist_, port); scm_display (p->immutable_property_alist_, port); - + scm_puts (" >\n", port); return 1; } @@ -176,11 +176,11 @@ Prob::instrumented_set_property (SCM sym, SCM val, const char*, int, const char* } void -Prob::internal_set_property (SCM sym, SCM val) +Prob::internal_set_property (SCM sym, SCM val) { if (do_internal_type_checking_global) type_check_assignment (sym, val); - + mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, val); } diff --git a/lily/staff-symbol-referencer-scheme.cc b/lily/staff-symbol-referencer-scheme.cc index 1ac308dec2..4c5b0530aa 100644 --- a/lily/staff-symbol-referencer-scheme.cc +++ b/lily/staff-symbol-referencer-scheme.cc @@ -39,7 +39,7 @@ LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position", LY_DEFINE (ly_position_on_line_p, "ly:position-on-line?", 2, 0, 0, (SCM sg, SCM spos), "Return whether @var{spos} is on a line of the staff associated" - " with the the grob @var{sg} (even on an extender line).") + " with the grob @var{sg} (even on an extender line).") { LY_ASSERT_SMOB (Grob, sg, 1); LY_ASSERT_TYPE (scm_is_number, spos, 2); diff --git a/ly/predefined-guitar-ninth-fretboards.ly b/ly/predefined-guitar-ninth-fretboards.ly index a1154e0607..fe3f957ea0 100644 --- a/ly/predefined-guitar-ninth-fretboards.ly +++ b/ly/predefined-guitar-ninth-fretboards.ly @@ -17,7 +17,7 @@ \version "2.12.0" -% Add ninth chords to to predefined fret diagrams for standard guitar tunings +% Add ninth chords to predefined fret diagrams for standard guitar tunings \addChordShape #'c:9 #guitar-tuning #"x;3-2;2-1;3-3-(;3-3;3-3-);" \addChordShape #'f:9 #guitar-tuning #"1-1-(;3-3;1-1;2-2;1-1-);3-4;" diff --git a/mf/feta-numbers.mf b/mf/feta-numbers.mf index 08f354b02c..9219f5eafc 100644 --- a/mf/feta-numbers.mf +++ b/mf/feta-numbers.mf @@ -58,7 +58,7 @@ foot_width# := 9/4 thick#; % -% These numbers were taken from a part that that the EJE violas played +% These numbers were taken from a part that the EJE violas played in % 1997 -- Probably Mendelssohn's ouverture `Heimkehr aus der Fremde'. % diff --git a/mf/feta-params.mf b/mf/feta-params.mf index 5d050c38eb..a8e322f8b4 100644 --- a/mf/feta-params.mf +++ b/mf/feta-params.mf @@ -19,9 +19,9 @@ stafflines := 5; % -% The design size of a staff should really be the +% The design size of a staff should really be the % staff_space, but we use staffsize for historical reasons. -% +% staff_space# := staffsize# / (stafflines - 1); staff_space_rounded# := staff_space#; @@ -42,11 +42,11 @@ fixed_line_thickness + variable_line_factor * 5 pt# = 0.50 pt#; fixed_line_thickness + variable_line_factor * 4.125 pt# = 0.47 pt#; stafflinethickness# := fixed_line_thickness - + variable_line_factor * staff_space#; + + variable_line_factor * staff_space#; stafflinethickness_rounded# := stafflinethickness#; % -% The following tunes the general blackness of the glyphs. +% The following tunes the general blackness of the glyphs. % linethickness# := stafflinethickness#; %% 0.5 pt#; @@ -79,7 +79,7 @@ if ledgerlinethickness_rounded > 2 stafflinethickness_rounded: ledgerlinethickness_rounded := 2 stafflinethickness_rounded; fi; -% +% % Because of the engraving/stamping process, no traditional % characters have sharp edges and corners. % The following variable controls the amount of `roundness'. @@ -162,8 +162,8 @@ define_pixels (blot_diameter); % . Restore height and decrease `d' by 1. % % o The glyph is centered between two or four staff lines, and the origin is -% the middle of the whitespace. Assuming that the the whitespace consists -% of an odd number of pixels, we have this: +% the middle of the whitespace. Assuming that the whitespace consists of +% an odd number of pixels, we have this: % % ----------- % b diff --git a/python/musicexp.py b/python/musicexp.py index 6ef352b189..695f540db3 100644 --- a/python/musicexp.py +++ b/python/musicexp.py @@ -988,7 +988,7 @@ class BracketSpannerEvent (SpanEvent): def print_before_note (self, printer): if self.span_direction == -1: printer.dump ('\[') - # the the bracket after the last note + # the bracket after the last note def print_after_note (self, printer): if self.span_direction == 1: printer.dump ('\]') -- 2.39.2