From: hanwen <hanwen>
Date: Fri, 4 Jul 2003 10:41:08 +0000 (+0000)
Subject: * input/regression/instrument-name-partial.ly: move from input/test.
X-Git-Tag: release/1.7.25~49
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=294070b295a40fc1a3227bb1dbf37824fe58eb9e;p=lilypond.git

* 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.
---

diff --git a/ChangeLog b/ChangeLog
index cac377f87d..c71a2484a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 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
diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly
index a0ba328692..e2ef2c27a4 100644
--- a/input/regression/grace-nest3.ly
+++ b/input/regression/grace-nest3.ly
@@ -1,4 +1,7 @@
 \version "1.7.18"
+\header {
+    texidoc = "Another nested grace situation"
+    }
 
 \score { \notes \relative c'' {
 	f1
diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index 0c5c45b3c9..b09734c0db 100644
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,4 +1,7 @@
 \version "1.7.18"
+\header {
+    texidoc = "Another nested grace situation"
+    }
 
 \score
 { \notes \relative c'' {
diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly
new file mode 100644
index 0000000000..ce50eeaf51
--- /dev/null
+++ b/input/regression/instrument-name-partial.ly
@@ -0,0 +1,10 @@
+\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 }
+}
+
diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly
index 6a01d7a6e3..dfdc4a8c6e 100644
--- a/input/regression/repeat-volta-skip-alternatives.ly
+++ b/input/regression/repeat-volta-skip-alternatives.ly
@@ -1,4 +1,9 @@
 \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
diff --git a/input/regression/size13.ly b/input/regression/size13.ly
index 9a7cec06ab..c6304eb92a 100644
--- a/input/regression/size13.ly
+++ b/input/regression/size13.ly
@@ -3,5 +3,9 @@ foollilypondbook = "
 \score
 "
 
+\header {
+    texidoc ="Staff height 13 pt"
+    }
+
 \include "paper13.ly"
 \include "allfontstyle.ly"
diff --git a/input/regression/size16.ly b/input/regression/size16.ly
index d7501fe576..5f2345e799 100644
--- a/input/regression/size16.ly
+++ b/input/regression/size16.ly
@@ -3,6 +3,11 @@ foollilypondbook = "
 \score
 "
 
+\header {
+    texidoc ="Staff height 16 pt"
+    }
+
+
 
 \include "paper16.ly"
 \include "allfontstyle.ly"
diff --git a/input/regression/size20.ly b/input/regression/size20.ly
index ee51d250a5..2b7ea1122e 100644
--- a/input/regression/size20.ly
+++ b/input/regression/size20.ly
@@ -3,6 +3,11 @@ foollilypondbook = "
 \score
 "
 
+\header {
+    texidoc ="Staff height 20 pt"
+    }
+
+
 
 \include "paper20.ly"
 \include "allfontstyle.ly"
diff --git a/input/regression/size23.ly b/input/regression/size23.ly
index bb05df5d0c..4830fa4d14 100644
--- a/input/regression/size23.ly
+++ b/input/regression/size23.ly
@@ -3,5 +3,10 @@ foollilypondbook = "
 \score
 "
 
+\header {
+    texidoc ="Staff height 23 pt"
+    }
+
+
 \include "paper23.ly"
 \include "allfontstyle.ly"
diff --git a/input/regression/size26.ly b/input/regression/size26.ly
index e8ab3681d5..7fa6600ef6 100644
--- a/input/regression/size26.ly
+++ b/input/regression/size26.ly
@@ -3,6 +3,11 @@ foollilypondbook = "
 \score
 "
 
+\header {
+    texidoc ="Staff height 26 pt"
+    }
+
+
 
 \include "paper26.ly"
 \include "allfontstyle.ly"
diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly
index dfac6626ac..a077e63f92 100644
--- a/input/regression/slur-symmetry-1.ly
+++ b/input/regression/slur-symmetry-1.ly
@@ -1,4 +1,8 @@
 \version "1.7.18"
+\header
+{
+  texidoc = "Symmetric figures should lead to symmetric slurs."
+}
 
 \score{
 	\notes\relative c''<
diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly
index aa06e7219a..4a66e5f468 100644
--- a/input/regression/slur-symmetry.ly
+++ b/input/regression/slur-symmetry.ly
@@ -1,4 +1,9 @@
 \version "1.7.18"
+\header
+{
+    texidoc = "Symmetric figures should lead to symmetric slurs."
+
+}
 
 \score{
 	\notes\relative c'<
diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly
index 51e02aa182..17c2713afc 100644
--- a/input/regression/text-spanner.ly
+++ b/input/regression/text-spanner.ly
@@ -1,6 +1,7 @@
 \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'' {
diff --git a/input/test/chords.ly b/input/test/chords.ly
deleted file mode 100644
index 7455346197..0000000000
--- a/input/test/chords.ly
+++ /dev/null
@@ -1,76 +0,0 @@
-% 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 
-		}
-	}
-}
-
-%}
diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly
deleted file mode 100644
index 555d0dc1df..0000000000
--- a/input/test/staff-margin-partial.ly
+++ /dev/null
@@ -1,11 +0,0 @@
-\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 }
-  }
-}
-
diff --git a/input/test/title.ly b/input/test/title.ly
index 7928ca95b4..a0b5b35830 100644
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -16,6 +16,8 @@
   copyright = "public domain"
   enteredby = "jcn"
   source =  "urtext"
+
+  texidoc ="This test ly2dvi titling. process with ly2dvi, not lilypond-book." 
 }
 
 \score {
diff --git a/input/test/uniform-breaking.ly b/input/test/uniform-breaking.ly
deleted file mode 100644
index ae70cb4b69..0000000000
--- a/input/test/uniform-breaking.ly
+++ /dev/null
@@ -1,119 +0,0 @@
-\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
-	}
-}
-
-
-
diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly
deleted file mode 100644
index a2e529f456..0000000000
--- a/input/test/vertical-text.ly
+++ /dev/null
@@ -1,22 +0,0 @@
-\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{
-
-	}
-}
-
-
-
diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 17cd71a5a2..b4657f893a 100644
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -231,9 +231,19 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
 	  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;
   
diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 3674775cda..8c73fb6cec 100644
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -448,7 +448,7 @@ Mensural_ligature_engraver::join_primitives (Array<Grob_info> primitives)
 	  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));
 	    }
 	}
diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 5c446c4270..849f785227 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -217,7 +217,7 @@ internal_brew_primitive (Grob *me, bool ledger_take_space)
 	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);
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index d4ac28c8e1..a0039f92d2 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -298,7 +298,7 @@ StaffGroupContext = \translator {
 LyricsVoiceContext= \translator{
 	\type "Engraver_group_engraver"
 	\consistsend "Hara_kiri_engraver"
-	minimumVerticalExtent = #'(-1.2 . 1.2)
+	minimumVerticalExtent = #'(-1.2 . 2.4)
 	extraVerticalExtent = ##f
 	verticalExtent = ##f
 
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index f9e3d92302..cf6484e9ad 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -532,9 +532,11 @@ staff in a row more often, when the heights of the notes vary.
 (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.")