s/illegal/invalid/

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 6a6dbc6d7c655882d9ec18f1415b5dc9d5a6d1d0..ef64af25b606fe753ac6d4015cba154f73f899fe 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -117,7 +117,7 @@ String_convert::hex2bin (string hex_string, string &bin_string_r)
       int high_i = hex2nibble (*byte++);
       int low_i = hex2nibble (*byte++);
       if (high_i < 0 || low_i < 0)
-       return 1; // illegal char
+       return 1; // invalid char
       bin_string_r += to_string ((char) (high_i << 4 | low_i), 1);
       i += 2;
     }

diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc
index 3f08b7131cf91ee6309c0dded54bb8cdc22b4048..91232d5b31c8e02b6f90c73bffff5039806f303b 100644 (file)
--- a/lily/gregorian-ligature-engraver.cc
+++ b/lily/gregorian-ligature-engraver.cc
@@ -84,7 +84,7 @@ void fix_prefix_set (int *current_set, int min_set, int max_set, Grob *primitive
 
 void check_and_fix_all_prefixes (vector<Grob_info> primitives)
 {
-  /* Check for illegal head modifier combinations */
+  /* Check for invalid head modifier combinations */
   for (vsize i = 0; i < primitives.size (); i++)
     {
       Grob *primitive = primitives[i].grob ();

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 11d32cd82419d9b084cf304cceef14d447ade1da..d45c90c7dc6f7f04d364c0301200f0abaad12b71 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -35,7 +35,7 @@
  * for example:
  * Ockeghem: Missa Ecce ancilla domini, bassus part, end of Christe.
  *
- * TODO: enhance robustness: in case of an illegal ligature (e.g. the
+ * TODO: enhance robustness: in case of an invalid ligature (e.g. the
  * input specifies a ligature that contains a minima), automatically
  * break the ligature into smaller, valid pieces.  Such a piece may be
  * a single note.

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index ce2286f3e25a0783d3012b71e32088b69784e0d7..471f9e8707f68b4fca45110a16da260d9e0fc391 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -237,7 +237,7 @@ Returns `obj'.
               (mult (/ (* times (ash 1 dots)) (1- (ash 2 dots))))
               (shift (- (ly:intlog2 (floor mult)))))
          (if (not (integer?  mult))
-              (ly:warning (_ "illegal tremolo repeat count: ~a") times))
+              (ly:warning (_ "invalid tremolo repeat count: ~a") times))
          (if (memq 'sequential-music (ly:music-property main 'types))
              ;; \repeat "tremolo" { c4 d4 }
              (let ((children (length (ly:music-property main 'elements))))