+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.
+++ /dev/null
-\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
music))
-\include "paper16.ly"
mel = \notes \transpose c c' {
\time 4/4 \key d \major
--- /dev/null
+\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 %%
\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."
}
\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'{
+++ /dev/null
-\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 %%
--- /dev/null
+\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 %%
% 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''{
\StaffContext
\consists Custos_engraver
}
-
+ raggedright = ##t
}
}
%% new-chords-done %%
\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
}
}
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 }
\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
}
>
+ \paper { raggedright = ##t }
}
+
%% new-chords-done %%
\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 %%
\score { \notes\relative c''' { c1 \break
\grace c8
-c1 }}
+c1 }
+
+\paper { raggedright = ##t }
+}
%% new-chords-done %%
run between centers of the note heads."
}
-\include "paper20.ly"
-\include "norsk.ly"
-
su = \notes{ \translator Staff = up}
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
}
-\include "paper20.ly"
-
\score {
\context Staff <
\property Score.skipBars = ##t
"
}
-\include "paper26.ly"
upperStaff = \context GregorianStaff = upperStaff <
\context GregorianVoice <
c1 c
}
-\include "paper16.ly"
\score {
<
R1*10 c1
}
-\include "paper16.ly"
\score {
<
%
\header{ texidoc="@cindex Paper a4 Fill
This should fill a4 paper. "
-%tagline="Ligly"
}
\include "paper13.ly"
\score{
"}
-\include "paper26.ly"
\include "gregorian-init.ly"
cantus = \notes \relative c' {
\version "1.7.18"
-\include "paper16.ly"
-
\score { \notes
\relative cis' {
texidoc="Template for part-combining orchestral scores"
}
-\include "paper16.ly"
-
raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1" }
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}
\version "1.7.18"
-\include "paper16.ly"
-\paper {
-}
muz = \notes \relative c'' {
\time 6/1
\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"
% 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
texidoc = "vaticana ligature test"
}
-\include "paper26.ly"
\include "gregorian-init.ly"
%
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;
if (ldir == DOWN && dy >= eps
&& fabs (my_modf (yl) - straddle) < eps)
dem += SECONDARY_BEAM_DEMERIT;
- }
+ }
if (fabs (yr - 2 * rdir * beam_translation) < rad + inter)
{
projects / lilypond.git / commitdiff