Reformat to match midi2ly output again.

diff --git a/ChangeLog b/ChangeLog
index 6e660000a417d183f887e374cfc49546eb95fe29..b6c7ac03deaad6955e09a9249c1c1ceab087175a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-05  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/test/midi-scales.ly: Reformat to match midi2ly output again.
+
 2003-08-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * input/template/gregorian-transcription.ly (barTwo): syntax update.

diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly
index 533d697b41bb931e3b8988bb90a57a9657df7859..01733eba6862710108ed45552d3de270d0608a1a 100644 (file)
--- a/input/test/midi-scales.ly
+++ b/input/test/midi-scales.ly
@@ -1,101 +1,147 @@
 \version "1.7.18"
 % candidate for regression.  -gp
 \header {
-texidoc="MIDI and midi2ly test file.  Diff between this and midi2ly.py (experimental, 1.5.17) should be minimal."
+  texidoc="MIDI and midi2ly test file.  Diff between this and midi2ly.py should be minimal."
 }
 
+%{
+  This means, doing:
+
+    lilypond input/test/midi-scales.ly
+    midi2ly midi-scales.midi
+    diff -u input/test/midi-scales.ly midi-scales-midi.ly
+
+  should show no differences at all in \key commands or notes.
+
+  Therefore, do not reformat this file unless midi2ly changes.
+
+  1.7.30 reformatted, because
+  midi2ly now outpts 1 bar per line and adds bar checks and numbers.
+
+%}
+
 scales = \notes \relative c {
 
   % [INSTRUMENT_NAME] bright acoustic
   \key c \major  % sharp-major
-  c' d e f g a b c 
+  c'4 d e f |
+  g a b c |
 
   \key g \major
-  g a b c d e fis g 
+  g a b c |
+  d e fis g |
 
   \key d \major
-  d, e fis g a b cis d 
+  d, e fis g |
+  a b cis d |
 
   \key a \major
-  a b cis d e fis gis a 
+  a b cis d |
+  e fis gis a |
 
   \key e \major
-  e, fis gis a b cis dis e 
+  e, fis gis a |
+  b cis dis e |
 
   \key b \major
-  b cis dis e fis gis ais b 
+  b cis dis e |
+  fis gis ais b |
 
   \key fis \major
-  fis, gis ais b cis dis eis fis 
+  fis, gis ais b |
+  cis dis eis fis |
 
   \key cis \major
-  cis, dis eis fis gis ais bis cis 
+  cis, dis eis fis |
+  gis ais bis cis |
 
   \key a \minor  % sharp-minor
-  a b c d e f gis a 
+  a b c d |
+  e f gis a |
 
   \key e \minor
-  e, fis g a b c dis e 
+  e, fis g a |
+  b c dis e |
 
   \key b \minor
-  b cis d e fis g ais b 
+  b cis d e |
+  fis g ais b |
 
   \key fis \minor
-  fis, gis a b cis d eis fis 
+  fis, gis a b |
+  cis d eis fis |
 
   \key cis \minor
-  cis, dis e fis gis a bis cis 
+  cis, dis e fis |
+  gis a bis cis |
 
   \key gis \minor
-  gis ais b cis dis e fisis gis 
+  gis ais b cis |
+  dis e fisis gis |
 
   \key dis \minor
-  dis, eis fis gis ais b cisis dis 
+  dis, eis fis gis |
+  ais b cisis dis |
 
   \key ais \minor
-  ais bis cis dis eis fis gisis ais 
+  ais bis cis dis |
+  eis fis gisis ais |
 
   \key f \major  % flat-major
-  f, g a bes c d e f 
+  f, g a bes |
+  c d e f |
 
   \key bes \major
-  bes c d ees f g a bes 
+  bes c d ees |
+  f g a bes |
 
   \key ees \major
-  ees,, f g aes bes c d ees 
+  ees,, f g aes |
+  bes c d ees |
 
   \key aes \major
-  aes, bes c des ees f g aes 
+  aes, bes c des |
+  ees f g aes |
 
   \key des \major
-  des,, ees f ges aes bes c des 
+  des,, ees f ges |
+  aes bes c des |
 
   \key ges \major
-  ges, aes bes ces des ees f ges 
+  ges, aes bes ces |
+  des ees f ges |
 
   \key ces \major
-  ces,, des ees fes ges aes bes ces 
+  ces,, des ees fes |
+  ges aes bes ces |
 
   \key d \minor  % flat-minor
-  d, e f g a bes cis d 
+  d, e f g |
+  a bes cis d |
 
   \key g \minor
-  g, a bes c d ees fis g 
+  g, a bes c |
+  d ees fis g |
 
   \key c \minor
-  c,, d ees f g aes b c 
+  c,, d ees f |
+  g aes b c |
 
   \key f \minor
-  f, g aes bes c des e f 
+  f, g aes bes |
+  c des e f |
 
   \key bes \minor
-  bes,, c des ees f ges a bes 
+  bes,, c des ees |
+  f ges a bes |
 
   \key ees \minor
-  ees, f ges aes bes ces d ees 
+  ees, f ges aes |
+  bes ces d ees |
 
   \key aes \minor
-  aes, bes ces des ees fes g aes 
+  aes, bes ces des |
+  ees fes g aes |
 }
 
 \score {