From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 13 Jun 2003 21:38:39 +0000 (+0000)
Subject: move from abe.ly
X-Git-Tag: release/1.7.21~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7979d8adaa8393daefd6585534221a93dd526758;p=lilypond.git

move from abe.ly
---

diff --git a/ChangeLog b/ChangeLog
index 1c81dff0df..8551d50016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,23 @@
+2003-06-13  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* input/regression/(various).ly: add raggedright = #t.
+
+	* input/regression/auto-beam.ly: move from abe.ly
+
 2003-06-13  Graham Percival  <gperlist@shaw.ca>
 
 	* input/test/f*.ly: added texinfo index.
+	
 	* input/test/broken-thread-line.ly: renamed to follow-break.ly.
 
 2003-06-13  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* lily/beam-quanting.cc (score_forbidden_quants): also add inter
+	quant penalty for beam just outside staff.
+
+	* input/regression/beam-quanting-horizontal.ly (texidoc): move
+	from beam-pos.ly,  remove non-horizontal tests. 
+
 	* input/test/(various): cleanup header info. 
 
 	* input/test/tchaikovsky.ly: remove file.
diff --git a/input/regression/abe.ly b/input/regression/abe.ly
deleted file mode 100644
index 6c4ac0dcce..0000000000
--- a/input/regression/abe.ly
+++ /dev/null
@@ -1,22 +0,0 @@
-\header {
-texidoc="Automatic beamer behaves nicely."
-}
-\version "1.7.18"
-
-\include "paper16.ly"
-\paper  { linewidth = 390.000000 \pt } 
-
-\score {
-  \notes \relative c'' {
-    a\longa a\breve  
-    a1 a2 a4 a8 a16 a32 a64 a64 
-  }
-  \paper {
-    \translator {
-      \StaffContext
-	\remove "Clef_engraver"
-%%	\remove "Staff_symbol_engraver"
-    }
-  }
-}
-%% new-chords-done %%
\ No newline at end of file
diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index 90cff0bb17..93d8449cc3 100644
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -40,7 +40,6 @@ FIXME: Shorten and docu
     music))
 
 
-\include "paper16.ly"
 
 mel = \notes \transpose c c' {
   \time 4/4 \key d \major
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
new file mode 100644
index 0000000000..38ba933f89
--- /dev/null
+++ b/input/regression/auto-beam.ly
@@ -0,0 +1,26 @@
+\header {
+
+texidoc="Test automatic beamer: the last measure should have a single beam."
+
+}
+
+\version "1.7.18"
+
+
+
+\paper  { raggedright = ##t } 
+
+\score {
+  \notes \relative c'' {
+    a\longa a\breve  
+    a1 a2 a4 a8 a16 a32 a64 a64 
+  }
+  \paper {
+    \translator {
+      \StaffContext
+	\remove "Clef_engraver"
+%%	\remove "Staff_symbol_engraver"
+    }
+  }
+}
+%% new-chords-done %%
diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index f350e5abc8..fb419b80c9 100644
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -2,9 +2,9 @@
 \version "1.7.18"
 \header{
 
-    texidoc="Simple beams on middle staffline be allowed to be
-    slightly sloped.  Beams reaching beyond middle line can have
-    bigger slope."
+    texidoc="Simple beams on middle staffline are allowed to be
+    slightly sloped, even if the notes have ledgers.  Beams reaching
+    beyond middle line can have bigger slope."
 
 }
 
diff --git a/input/regression/beam-chord.ly b/input/regression/beam-chord.ly
index 1de05e94d1..f37883393e 100644
--- a/input/regression/beam-chord.ly
+++ b/input/regression/beam-chord.ly
@@ -1,9 +1,9 @@
 \version "1.7.18"
 \header {
-texidoc = "MOVE TO REGTEST.
-If the first and last outer notes of a beam are the same, the beam should be
-be horizontal.
-"
+    
+texidoc = "If the first and last outer notes of a beam are the same,
+the beam should be be horizontal.  "
+
 }
 \score{
 	\notes	\transpose c' c'{
diff --git a/input/regression/beam-pos.ly b/input/regression/beam-pos.ly
deleted file mode 100644
index af2e64544c..0000000000
--- a/input/regression/beam-pos.ly
+++ /dev/null
@@ -1,31 +0,0 @@
-\version "1.7.18"
-%  does this belong in regression?  delete it?  it doens't look
-%  like a special trick or a great learning tool, but it might
-%  be useful in testing length os beam stems, or something like
-%  that.
-
-\header{
-texidoc =	 "test beam quant positions"
-}
-
-\score{
-	\notes\relative c' { 
-		 c8-[ c]  a''-[ a]
-		 a,-[ a]  c-[ c]
-		 d,8-[ d]  g'-[ g]
-		 g,-[ g]  d'-[ d]
-		 c,16-[ c c c]  a''-[ a a a]
-		 a,-[ a a a]  c-[ c c c]
-		\break
-		 c,32-[ c c c c c c c]  a''-[ a a a a a a a]
-		 f,-[ f f f f f f f]  e'-[ e e e e e e e]
-		\break
-		 c,8-[ d]  a''-[ g]
-		 g,-[ f]  d'-[ e]
-		\break
-	}
-	\paper{
-	}
-}
-
-%% new-chords-done %%
diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
new file mode 100644
index 0000000000..4959a5095d
--- /dev/null
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -0,0 +1,22 @@
+\version "1.7.18"
+
+\header{
+texidoc =	 "Test beam quant positions for horizontal beams."
+}
+
+\score{
+	\notes\relative c' { 
+		 c8-[ c]  a''-[ a]
+		 a,-[ a]  c-[ c]
+		 d,8-[ d]  g'-[ g]
+		 g,-[ g]  d'-[ d]
+		 c,16-[ c c c]  a''-[ a a a]
+		 a,-[ a a a]  c-[ c c c]
+		\break
+		 c,32-[ c c c c c c c]  a''-[ a a a a a a a]
+		 f,-[ f f f f f f f]  e'-[ e e e e e e e]
+		\break
+	}
+}
+
+%% new-chords-done %%
diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index 819437037a..99b9145b37 100644
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -4,7 +4,11 @@
 %  showing \stemUp?
 % all of those things are covered in refman and/or other files
 \header{
-  texidoc="DELETE ME
+  texidoc="
+Seconds are tricky.  We used to have problems with seconds being too
+steep, or getting too long stems.  In a file like this, showing
+seconds, you'll spot something fishy very quickly.
+ 
 " }
 \score{
     \notes\relative c''{
diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 2e5bbe5eb3..f83f23dd8d 100644
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -30,7 +30,7 @@
 	    \StaffContext
 	    \consists Custos_engraver
 	}
-	
+	raggedright = ##t
     }
 }
 %% new-chords-done %%
diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index 0dccafe716..db6cf5c5a1 100644
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -1,13 +1,13 @@
 \version "1.7.18"
 \header{
-texidoc = "Broken crescendi should look be open on one side."
+texidoc = "Broken crescendi should be open on one side."
 }
 
 \score { \notes \relative c'' { 
     c1 \< \break \! c1  \> \break \! c1 
   }
   \paper {
-    linewidth = 10.\cm
+    linewidth = 4.\cm
   }
 }
   
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index 95e9327295..d4275f8dca 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -5,9 +5,6 @@ texidoc  = " Ez-notation prints names in note heads.
 You also get ledger lines, of course."
 }
 
-\include "paper26.ly"
-\paper { \paperTwentysix }
-
 \score {
         \notes { c'2 e'4 f' | g'1 b8 }
         \paper { \translator { \EasyNotation }
diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index a319a83b1a..529695353a 100644
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -1,7 +1,6 @@
 \version "1.7.18"
 \header {
-texidoc = "Test figured bass.
-
+texidoc = "
 Figured bass is created by the FiguredBass context which eats
 figured bass requests and  rest-requests.  You must enter these using
 the special @code{\figures @{ @}} mode, which allows you to type
@@ -29,5 +28,7 @@ numbers, like @code{<4 6+>}.
   }
  
 >
+	\paper  { raggedright = ##t }  
  }
+
 %% new-chords-done %%
diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly
index 3e5ca5c1f0..f7d5d16da6 100644
--- a/input/regression/grace-auto-beam.ly
+++ b/input/regression/grace-auto-beam.ly
@@ -10,5 +10,6 @@
     \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f 
         \grace a8 g16 f e f |
   }
+  \paper { raggedright = ##t }
 }
 %% new-chords-done %%
diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly
index 6e4e547515..9f8b64d26c 100644
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -11,5 +11,8 @@ printed correctly.
 
 \score { \notes\relative c''' { c1 \break
 \grace c8
-c1  }}
+c1  }
+
+\paper { raggedright = ##t }
+}
 %% new-chords-done %%
diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly
index c452027d9d..2b91de2be7 100644
--- a/input/regression/note-line.ly
+++ b/input/regression/note-line.ly
@@ -5,9 +5,6 @@ texidoc = "Note head lines (eg glissando)
 run between centers of the note heads."
 }
 
-\include "paper20.ly"
-\include "norsk.ly"
-
 su = \notes{ \translator Staff = up}
 sd = \notes{ \translator Staff = down}
 
@@ -18,7 +15,7 @@ sd = \notes{ \translator Staff = down}
             \property PianoStaff.connectArpeggios = ##t
 	    \showStaffSwitch
 	    \clef F
-	    c4 d \sd h a g8 f16 e32 d \su g2 \glissando a,4 \sd \break a2. \su g4 \glissando f1
+	    c4 d \sd b a g8 f16 e32 d \su g2 \glissando a,4 \sd \break a2. \su g4 \glissando f1
 	}
 	\context Staff = down {
 	    \clef F s1*4
diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly
index 0ecf39697c..f87bddda52 100644
--- a/input/regression/repeat-percent-skipbars.ly
+++ b/input/regression/repeat-percent-skipbars.ly
@@ -3,8 +3,6 @@ texidoc = "Percent repeats are not skipped, even when skipBars is set.  "
 }
 
 
-\include "paper20.ly"
-
 \score {
      \context Staff <
 	\property Score.skipBars = ##t
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index b652256df8..e23156e7d8 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -8,7 +8,6 @@ included in Lilypond's support of ancient notation.
 "
 }
 
-\include "paper26.ly"
 
 upperStaff =  \context GregorianStaff = upperStaff <
   \context GregorianVoice <
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 61cfa3730b..d2a376e4cf 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -97,7 +97,6 @@ violoncello = \notes \relative c' {
   c1 c
 }
 
-\include "paper16.ly"
 
 \score {
   < 
diff --git a/input/test/equaliser.ly b/input/test/equaliser.ly
index 7757f495bd..bc7023e616 100644
--- a/input/test/equaliser.ly
+++ b/input/test/equaliser.ly
@@ -96,7 +96,6 @@ violoncello = \notes \relative c' {
   R1*10 c1
 }
 
-\include "paper16.ly"
 
 \score {
   < 
diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
index fd1aa89ca9..919a8645b3 100644
--- a/input/test/fill-a4.ly
+++ b/input/test/fill-a4.ly
@@ -13,7 +13,6 @@
 %
 \header{ texidoc="@cindex Paper a4 Fill
 This should fill a4 paper. "
-%tagline="Ligly"
 }
 \include "paper13.ly"
 \score{
diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index 70326fad44..c1424b7f65 100644
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -20,7 +20,6 @@ FIXME: padding/minimum-distance is fragile.
 
 "}
 
-\include "paper26.ly"
 \include "gregorian-init.ly"
 
 cantus = \notes \relative c' {
diff --git a/input/test/key-clefs.ly b/input/test/key-clefs.ly
index 13e668870d..998b37fb62 100644
--- a/input/test/key-clefs.ly
+++ b/input/test/key-clefs.ly
@@ -1,7 +1,5 @@
 \version "1.7.18"
 
-\include "paper16.ly"
-
 \score { \notes
   \relative cis' {
 
diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly
index 7d7f33c8c2..d69aae3060 100644
--- a/input/test/part-combine-score.ly
+++ b/input/test/part-combine-score.ly
@@ -4,8 +4,6 @@
 texidoc="Template for part-combining orchestral scores"
 }
   
-\include "paper16.ly" 
-
 				
 raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1"  }
 
diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
index c9fbe38dc2..4b1c7a145a 100644
--- a/input/test/partial-blank.ly
+++ b/input/test/partial-blank.ly
@@ -5,8 +5,6 @@
     This thing implements it by adding invisible staff with lots of fast notes.
 %}
 
-\include "paper16.ly"
-
 
 quickmeasure = \notes {[\repeat unfold 16 c''16]}
 mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2}
diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly
index 51576f3137..2ce48b361a 100644
--- a/input/test/rest-dot-positions.ly
+++ b/input/test/rest-dot-positions.ly
@@ -1,7 +1,4 @@
 \version "1.7.18"
-\include "paper16.ly"
-\paper  {
-}
 
 muz = \notes \relative c'' {
     \time 6/1
diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly
index d27cb44f61..9525ab11ef 100644
--- a/input/test/scales-greek.ly
+++ b/input/test/scales-greek.ly
@@ -1,37 +1,51 @@
 \version "1.7.18"
 
 \header {
-	crossRefNumber = "1"
-	tagline = "Automatically converted from ABC"
-texidoc = "Show different scales."
-	
+  texidoc = "Show different scales."
 }
 
 voicedefault = \notes {
 \property Score.defaultBarType="empty"
 
-\key c \major     c'8 -"major"   d'8    e'8    f'8    g'8    a'8    b'8    
-c''8    \key c \ionian     c'8 -"ionian"   d'8    e'8    f'8    g'8    a'8    
-b'8    c''8    \key d \dorian     c'8 -"dorian"   d'8    e'8    f'8    g'8    
-a'8    b'8    c''8    \key e \phrygian     c'8 -"phrygian"   d'8    e'8    f'8 
-   g'8    a'8    b'8    c''8    \key f \lydian     c'8 -"lydian"   d'8    e'8  
-  f'8    g'8    a'8    b'8    c''8    \key g \mixolydian     c'8 -"mixolydian" 
-  d'8    e'8    f'8    g'8    a'8    b'8    c''8    \key a \minor     c'8 
--"minor"   d'8    e'8    f'8    g'8    a'8    b'8    c''8    \key a \aeolian   
-  c'8 -"aeolian"   d'8    e'8    f'8    g'8    a'8    b'8    c''8    
-\key b \locrian     c'8 -"locrian"   d'8    e'8    f'8    g'8    a'8    b'8    
-c''8    \key f \major     c'8 -"major"   d'8    e'8    f'8    g'8    a'8    
-bes'8    c''8    \key f \ionian     c'8 -"ionian"   d'8    e'8    f'8    g'8   
- a'8    bes'8    c''8    \key g \dorian     c'8 -"dorian"   d'8    e'8    f'8  
-  g'8    a'8    bes'8    c''8    \key a \phrygian     c'8 -"phrygian"   d'8    
-e'8    f'8    g'8    a'8    bes'8    c''8    \key bes \lydian     c'8 
--"lydian"   d'8    e'8    f'8    g'8    a'8    bes'8    c''8    
-\key c \mixolydian     c'8 -"mixolydian"   d'8    e'8    f'8    g'8    a'8    
-bes'8    c''8    \key d \aeolian     c'8 -"aeolian"   d'8    e'8    f'8    g'8 
-   a'8    bes'8    c''8    \key d \minor     c'8 -"minor"   d'8    e'8    f'8  
-  g'8    a'8    bes'8    c''8    \key e \locrian     c'8 -"locrian"   d'8    
-e'8    f'8    g'8    a'8    bes'8    c''8    
-}\score{
+\key c \major c'8 -"major" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key c \ionian c'8 -"ionian" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key d \dorian c'8 -"dorian" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key e \phrygian c'8 -"phrygian" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key f \lydian c'8 -"lydian" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key g \mixolydian c'8 -"mixolydian" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key a \minor c'8 -"minor" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key a \aeolian c'8 -"aeolian" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key b \locrian c'8 -"locrian" d'8 e'8 f'8 g'8 a'8 b'8 c''8
+
+\key f \major c'8 -"major" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key f \ionian c'8 -"ionian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key g \dorian c'8 -"dorian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key a \phrygian c'8 -"phrygian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key bes \lydian c'8 -"lydian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key c \mixolydian c'8 -"mixolydian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key d \aeolian c'8 -"aeolian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key d \minor c'8 -"minor" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+\key e \locrian c'8 -"locrian" d'8 e'8 f'8 g'8 a'8 bes'8 c''8
+
+}
+
+\score{
         \notes <
 
 	\context Staff="default"
diff --git a/input/test/trills.ly b/input/test/trills.ly
index 3d25a14ea1..e12b5eaffc 100644
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,7 +1,7 @@
 
 % Generated automatically by: lilypond-book.py
 % options are filename=/var/fred/cvs/savannah/lilypond/input/test/trills.ly printfilename  
-\include "paper16.ly"
+
 \paper  {
   linewidth = 433.619940\pt
   
diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly
index 9130f38a62..41bc93a545 100644
--- a/input/test/vaticana.ly
+++ b/input/test/vaticana.ly
@@ -3,7 +3,6 @@
     texidoc	= "vaticana ligature test"
 }
 
-\include "paper26.ly"
 \include "gregorian-init.ly"
 
 %
diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 29a42034b3..45fb5e5c93 100644
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -349,15 +349,16 @@ Beam::score_forbidden_quants (Real yl, Real yr,
   Real dy = yr - yl;
 
   Real dem = 0.0;
-  if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3)
-    dem += INTER_QUANT_PENALTY;
-  if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3)
-    dem += INTER_QUANT_PENALTY;
+  for (int i = 0; i < 2; i++)
+    {
+      Real y = i? yl : yr;
+      if (fabs (y) <= (rad + 0.5) && fabs ( my_modf (y) - 0.5) < 1e-3)
+	dem += INTER_QUANT_PENALTY;
+    }
 
   // todo: use beam_count of outer stems.
   if (beam_count >= 2)
     {
-     
       Real straddle = 0.0;
       Real sit = (thickness - slt) / 2;
       Real inter = 0.5;
@@ -417,7 +418,7 @@ Beam::score_forbidden_quants (Real yl, Real yr,
 	      if (ldir == DOWN && dy >= eps
 		  && fabs (my_modf (yl) - straddle) < eps)
 		dem += SECONDARY_BEAM_DEMERIT;
-	}
+	    }
 	  
 	  if (fabs (yr - 2 * rdir * beam_translation) < rad + inter)
 	    {