From 4981ec4bbce0de7ff10636a053e70ca37d0add2c Mon Sep 17 00:00:00 2001 From: Erlend Aasland Date: Thu, 29 Nov 2007 10:43:45 +0100 Subject: [PATCH] Remove hungarian postfix. --- flower/offset.cc | 4 ++-- lily/include/audio-item.hh | 2 +- lily/include/audio-staff.hh | 2 +- lily/include/lily-parser.hh | 2 +- lily/include/midi-chunk.hh | 2 +- lily/lookup.cc | 4 ++-- lily/stem.cc | 8 ++++---- lily/vaticana-ligature-engraver.cc | 20 ++++++++++---------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flower/offset.cc b/flower/offset.cc index 294f69e6f8..2d361d8407 100644 --- a/flower/offset.cc +++ b/flower/offset.cc @@ -20,7 +20,7 @@ Offset::to_string () const #endif bool -isinf_b (Real r) +is_inf (Real r) { return (fabs (r) > 1e20); } @@ -33,7 +33,7 @@ Offset complex_multiply (Offset z1, Offset z2) { Offset z; - if (!isinf_b (z2[Y_AXIS])) + if (!is_inf (z2[Y_AXIS])) { z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS] * z2[Y_AXIS]; z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS]; diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index 81939867f3..3230e5ce48 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -103,7 +103,7 @@ public: class Audio_tempo : public Audio_item { public: - Audio_tempo (int per_minute_4_i); + Audio_tempo (int per_minute_4); int per_minute_4_; }; diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh index 6c3da3b1b9..cdce0298fe 100644 --- a/lily/include/audio-staff.hh +++ b/lily/include/audio-staff.hh @@ -14,7 +14,7 @@ struct Audio_staff : public Audio_element { void add_audio_item (Audio_item *l); - void output (Midi_stream &midi_stream_r, int track_i); + void output (Midi_stream &midi_stream_r, int track); Audio_staff (); diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh index e9a42109e0..ed4673de78 100644 --- a/lily/include/lily-parser.hh +++ b/lily/include/lily-parser.hh @@ -30,7 +30,7 @@ class Lily_parser Simultaneous_music *get_chord (Pitch tonic, vector *adds, vector *subs, Pitch *inversion, Pitch *bass, Duration d); - void set_chord_tremolo (int type_i); + void set_chord_tremolo (int type); void set_last_duration (Duration const *); void set_last_pitch (Pitch const *); diff --git a/lily/include/midi-chunk.hh b/lily/include/midi-chunk.hh index fc41a541f0..64071d913c 100644 --- a/lily/include/midi-chunk.hh +++ b/lily/include/midi-chunk.hh @@ -53,7 +53,7 @@ class Midi_header : public Midi_chunk public: DECLARE_CLASSNAME(Midi_header); - Midi_header (int format_i, int tracks_i, int clocks_per_4_i); + Midi_header (int format, int tracks, int clocks_per_4); }; class Midi_track : public Midi_chunk diff --git a/lily/lookup.cc b/lily/lookup.cc index fc6a2e896b..0050002223 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -256,8 +256,8 @@ Lookup::round_filled_polygon (vector const &points, /* remove consecutive duplicate points */ for (vsize i = 0; i < points.size (); i++) { - int next_i = (i + 1) % points.size (); - Real d = (points[i] - points[next_i]).length (); + int next = (i + 1) % points.size (); + Real d = (points[i] - points[next]).length (); if (d < epsilon) programming_error ("Polygon should not have duplicate points"); } diff --git a/lily/stem.cc b/lily/stem.cc index 4ac91fa7f3..6016eebbb4 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -290,8 +290,8 @@ Stem::calc_stem_end_position (SCM smob) Real stem_end = dir ? hp[dir] + dir * length : 0; /* TODO: change name to extend-stems to staff/center/'() */ - bool no_extend_b = to_boolean (me->get_property ("no-stem-extend")); - if (!no_extend_b && dir * stem_end < 0) + bool no_extend = to_boolean (me->get_property ("no-stem-extend")); + if (!no_extend && dir * stem_end < 0) stem_end = 0.0; return scm_from_double (stem_end); @@ -931,9 +931,9 @@ Stem::calc_stem_info (SCM smob) Obviously not for grace beams. Also, not for knees. Seems to be a good thing. */ - bool no_extend_b = to_boolean (me->get_property ("no-stem-extend")); + bool no_extend = to_boolean (me->get_property ("no-stem-extend")); bool is_knee = to_boolean (beam->get_property ("knee")); - if (!no_extend_b && !is_knee) + if (!no_extend && !is_knee) { /* Highest beam of (UP) beam must never be lower than middle staffline */ diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 45a30edf6c..b0f09c236e 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -106,41 +106,41 @@ bool Vaticana_ligature_engraver::is_stacked_head (int prefix_set, int context_info) { - bool is_stacked_b; + bool is_stacked; // upper head of pes is stacked upon lower head of pes ... - is_stacked_b = context_info & PES_UPPER; + is_stacked = context_info & PES_UPPER; // ... unless this note starts a flexa if (context_info & FLEXA_LEFT) - is_stacked_b = false; + is_stacked = false; // ... or another pes if (context_info & PES_LOWER) - is_stacked_b = false; + is_stacked = false; // ... or the previous note is a semivocalis or inclinatum if (context_info & AFTER_DEMINUTUM) - is_stacked_b = false; + is_stacked = false; // auctum head is never stacked upon preceding note if (prefix_set & AUCTUM) - is_stacked_b = false; + is_stacked = false; // virga is never stacked upon preceding note if (prefix_set & VIRGA) - is_stacked_b = false; + is_stacked = false; // oriscus is never stacked upon preceding note if (prefix_set & ORISCUS) - is_stacked_b = false; + is_stacked = false; if ((prefix_set & DEMINUTUM) && ! (prefix_set & INCLINATUM) && (context_info & FLEXA_RIGHT)) - is_stacked_b = true; // semivocalis head of deminutus form + is_stacked = true; // semivocalis head of deminutus form - return is_stacked_b; + return is_stacked; } /* -- 2.39.5