2003-07-04 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * input/regression/instrument-name-partial.ly: move from input/test.
+
+ * input/test/vertical-text.ly: remove
+
+ * ly/engraver-init.ly (LyricsVoiceContext): add more vertical
+ space above lyrics lines.
+
+ * input/test/uniform-breaking.ly: remove file.
+
+ * lily/gourlay-breaking.cc (combine_demerits): add comment about
+ uniform spacing density.
+
+ * input/test/chords.ly (keys): remove file.
+
* scm/documentation-lib.scm (oop): use srfi-1 too.
* input/regression/*.ly: add \version
\version "1.7.18"
+\header {
+ texidoc = "Another nested grace situation"
+ }
\score { \notes \relative c'' {
f1
\version "1.7.18"
+\header {
+ texidoc = "Another nested grace situation"
+ }
\score
{ \notes \relative c'' {
--- /dev/null
+\version "1.7.18"
+\header {
+ texidoc = "Instrument names are also printed on partial starting measures."
+}
+
+\score {
+ \notes \relative c'' { \property Staff.instrument = "foo" \partial 4 c4 c1 }
+ \paper { raggedright = ##t }
+}
+
\version "1.7.18"
+\header {
+ texidoc = "When too few alternatives are present, the first alternative is repeated,
+by printing a range for the 1st repeat."
+ }
+
\score { \notes \context Voice {
\repeat volta 3 c1
\score
"
+\header {
+ texidoc ="Staff height 13 pt"
+ }
+
\include "paper13.ly"
\include "allfontstyle.ly"
\score
"
+\header {
+ texidoc ="Staff height 16 pt"
+ }
+
+
\include "paper16.ly"
\include "allfontstyle.ly"
\score
"
+\header {
+ texidoc ="Staff height 20 pt"
+ }
+
+
\include "paper20.ly"
\include "allfontstyle.ly"
\score
"
+\header {
+ texidoc ="Staff height 23 pt"
+ }
+
+
\include "paper23.ly"
\include "allfontstyle.ly"
\score
"
+\header {
+ texidoc ="Staff height 26 pt"
+ }
+
+
\include "paper26.ly"
\include "allfontstyle.ly"
\version "1.7.18"
+\header
+{
+ texidoc = "Symmetric figures should lead to symmetric slurs."
+}
\score{
\notes\relative c''<
\version "1.7.18"
+\header
+{
+ texidoc = "Symmetric figures should lead to symmetric slurs."
+
+}
\score{
\notes\relative c'<
\version "1.7.18"
-
-% text spanners should not repeat start text when broken
+\header {
+texidoc= "Text spanners should not repeat start text when broken"
+}
\score {
\notes \relative c'' {
+++ /dev/null
-% FIXME: doesn't display anything useful.
-\version "1.7.18"
-\score { \notes { c4^"fixme"}}
-
-
-%{
-Would this be acceptable/good enough/convenient for entry?
-
- Convention/Standard Lily
-
- C# cis
- Cb ces
- Cm Cmin c:3- c:m c:min
- Caug c:5+ c:aug
- Cdim c:3-.5- c:dim
- Cmaj7 c:7+ c:maj
- C7 c:7
- Csus Csus4 c:4 c:sus
-
-%}
-
-%{
-
-% used to be quarter notes here. Why? --hwn
-scales = \notes \transpose c c' \chords{
- %<<c e g>>1
- c1:m c:min c:dim c:aug c:sus c:maj
- c1:6 c:7 c:9 c:11 c:13
- c:m7 c:m sus c:m7.sus
- c:dim7 c:dim9 c2:7^5
- c:13^5.7.9.11
- % c1:7^5 c:13^5
- c1 g d a e b fis
- c1 f bes es as des ges
- % wierd, multiple :add, ^sub
- c:7+.9-^3.5
- % long
- c\breve c\longa
- }
-
-keys = \notes{
- s1
- s1 s1 s1
- s1 s1
- s1
- \key g \major s1
- \key d \major s1
- \key a \major s1
- \key e \major s1
- \key b \major s1
- \key fis \major s1
- \key c \major s1
- \key f \major s1
- \key bes \major s1
- \key es \major s1
- \key as \major s1
- \key des \major s1
- \key ges \major s1
- \key c \major s1*2
- \key c \major s1*6
- }
-
-\score{
- <
- \context ChordNames \scales
- \context Staff < \scales \keys >
- >
- \paper{
- \translator {
- \ChordNamesContext
- ChordName \override #'word-space = #1
- }
- }
-}
-
-%}
+++ /dev/null
-\version "1.7.18"
-% test staff margin with partial measure.
-% regression. -gp
-
-\score {
-\notes { \property Staff.instrument = "foo" \partial 4 c4 c1 }
- \paper {
- \translator { \StaffContext \consists Instrument_name_engraver }
- }
-}
-
copyright = "public domain"
enteredby = "jcn"
source = "urtext"
+
+ texidoc ="This test ly2dvi titling. process with ly2dvi, not lilypond-book."
}
\score {
+++ /dev/null
-\version "1.7.18"
-% definately need to check with Han or Jan for this one.
-% I haven't a clue what it does, but the output doesn't look
-% special. -gP
-
-
-%{
-Hmm, ik vraag me af of dit al helemaal koel is.
-
- return abs (this_one.force_f_) + abs (prev.force_f_ - this_one.force_f_)
- + break_penalties
-
-Neem als voorbeeld iets dat lijkt op allemande: keuze tussen 2 of drie
-maten per regel.
-
-* 2 lange maten -> lelie kiest 2 /regel :beetje los
-* 3 korte -> lelie kiest 3 /regel :beetje krap
-* 2 korte, 1 lange -> 3/regel :krap
-* 1 korte, 2 lange -> 3/regel :erg krap
-* 3 lange -> 3/regel :urg krap
-
-als je naar beloningen kijkt, kan ik me goed voorstellen dat sprong
-van 'al wat krapper' naar los te groot wordt, en ze dus steeds krapper
-wordt, tot urg krap aan toe, want kracht lineair? Dat lijkt ook geval
-in allemande.
-
-Zie hoe eerst 10 en 9 mooi op 2maat/regel staan terwijl later tot 14
-toe 3/regel.
-
-Heb niet zomaar beter idee, nog.
-%}
-
-\score{
- \notes\relative c'{
- % 10
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c c c8 ces c ces
-
- % 9
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c c c8 c ces c
-
- % 1
- c4 c c c
- c4 c c c
- c4 c c c
-
- % 2
- c4 c c c
- c4 c c c
- c4 c c8 c c c
-
- % 3
- c4 c c c
- c4 c c c
- c8 c c c c8 c c c
-
- % 4
- c4 c c c
- c4 c c8 c c c
- c8 c c c c8 c c c
-
- % 5
- c4 c c c
- c8 c c c c8 c c c
- c8 c c c c8 c c c
-
- % 6
- c4 c c8 c c c
- % c4 c c c8 c
- c8 c c c c8 c c c
- c8 c c c c8 c c c
-
- % 7
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c c c8 c c c
-
- % 8
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c c c8 c c ces
-
- % 9
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c c c8 c ces c
-
- % 10
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c c c8 ces c ces
-
- % 11
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c c ces8 c ces c
-
- % 12
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c c ces c8 ces c ces
-
- % 13
- c8 c c c c8 c c c
- c8 c c c c8 c c c
- c8 c ces c ces8 c ces c
-
- }
- \paper {
- indent=0.0\mm
- linewidth=90.0\mm
- }
-}
-
-
-
+++ /dev/null
-\version "1.7.18"
-% TODO: huh? This text isn't vertical...?
-
-\score{
- <
- \context Staff = o \notes\relative c,,, {
- \stemDown c8-[ c c c] c4 c4 \break c8-[ c c c] c4 c4
- }
- \context Lyrics \lyrics{
- BLA gag _2 < { BLA gag } { BLA gag la } > _2
- }
- \context Staff = t \notes\relative c''''' {
- \stemUp c8-[ c c c] c4 c c8-[ c c c] c4 c
- }
- >
- \paper{
-
- }
-}
-
-
-
break_penalties += gh_scm2double (pen);
}
}
+
/*
- Q: do want globally non-cramped lines, or locally equally cramped lines.
+ Q: do we want globally non-cramped lines, or locally equally
+ cramped lines?
+
+ There used to be an example file input/test/uniform-breaking to
+ demonstrate problems with this approach. When music is gradually
+ becoming denser, the uniformity requirement makes lines go from
+ cramped to even more cramped (because going from cramped
+ 3meas/line to relatively loose 2meas/line is such a big step.
+
*/
+
Real demerit = abs (this_one.force_) + abs (prev.force_ - this_one.force_)
+ break_penalties;
if (output & MLP_ANY)
{
int delta_pitch = (pitch.steps () - last_pitch.steps ());
- primitive->set_grob_property ("join-left",
+ primitive->set_grob_property ("join-left-amount",
gh_int2scm (delta_pitch));
}
}
return Molecule ();
}
- SCM join_left_scm = me->get_grob_property ("join-left");
+ SCM join_left_scm = me->get_grob_property ("join-left-amount");
if (join_left_scm != SCM_EOL)
{
int join_left = gh_scm2int (join_left_scm);
LyricsVoiceContext= \translator{
\type "Engraver_group_engraver"
\consistsend "Hara_kiri_engraver"
- minimumVerticalExtent = #'(-1.2 . 1.2)
+ minimumVerticalExtent = #'(-1.2 . 2.4)
extraVerticalExtent = ##f
verticalExtent = ##f
(grob-property-description 'position-callbacks list? "list of
functions set spanner positions.")
(grob-property-description 'join-left boolean? "is this ligature head joined with the previous one?")
+(grob-property-description 'join-left-amount number? "DOCME")
+
(grob-property-description 'delta-pitch number? "the interval between this and the neighbouring note, or, more precisely, their vertical distance; this is used in ligatures for calculation of the height of vertical joins flexa shapes")
(grob-property-description 'head-width ly:dimension? "width of this ligature head")
-(grob-property-description 'primitive ly:grob? "Pointer to a ligature primitive, i.e. an item similar to a note head that is part of a ligature.")
+(grob-property-description 'primitive integer? "Pointer to a ligature primitive, i.e. an item similar to a note head that is part of a ligature. [TODO: change this]")
(grob-property-description 'minimum-beam-collision-distance ly:dimension?
"Minimum distance to beam for a rest collision.")
projects / lilypond.git / commitdiff