* input/test/spanner-after-break-tweak.ly: import

broken-spanner-adjustment

* input/no-notation/midi-transposing.ly: move from input/test/

diff --git a/ChangeLog b/ChangeLog
index c71a2484a2fa659de1e4c464e41bebe5214f1e35..aa22948c936c07493582a2be4bcdafa485b97577 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-07-04  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/test/spanner-after-break-tweak.ly: import
+       broken-spanner-adjustment
+
+       * input/no-notation/midi-transposing.ly: move from input/test/
+
+       * input/test/: remove chord-markup
+
        * input/regression/instrument-name-partial.ly: move from input/test.
 
        * input/test/vertical-text.ly: remove

diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly
new file mode 100644 (file)
index 0000000..426aec7
--- /dev/null
+++ b/input/no-notation/midi-transposing.ly
@@ -0,0 +1,24 @@
+\version "1.7.18"
+
+\header { texidoc = "@cindex Transposing
+The transposing property leaves output invariant, but has effect on MIDI. "
+}
+
+\score { 
+  \context Voice \notes\relative c {
+    % btw: this is not how transposing is done in lilypond
+       % this is a transposing performer, i.e. for midi-output only
+       \property Staff.transposing = #0 c
+       \property Staff.transposing = #2 c
+       \property Staff.transposing = #4 c
+       \property Staff.transposing = #5 c
+       \property Staff.transposing = #7 c
+       \property Staff.transposing = #9 c
+       \property Staff.transposing = #11 c
+       \property Staff.transposing = #12 c
+       
+  }
+  \paper { raggedright = ##t } 
+  \midi { }
+}
+

diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index 887bb8f89a54381b0b9c85776db20ac42ad80b77..4087dc57d9edcc0bb88cd1f833459597c6871146 100644 (file)
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -23,6 +23,8 @@ texidoc = "New markup syntax."
                \musicglyph #"accidentals--1"
                \combine "X" "+"   
                \combine "o" "/"
+
+               \box \column << { "string 1" } { "string 2" } >>
                "$\\emptyset$"
                \italic Norsk
                \super "2"

diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index 8af91c2292f03e296e1e17867323896395b8ddeb..46e8f4450bf88df3761829f15a71f8f8d74cf5db 100644 (file)
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -1,4 +1,5 @@
-\version "1.7.18"  %% or actually: 1.7.1 ...
+\version "1.7.23"
+
 \header {
 texidoc= "@cindex make-music Fingering
 You can add various stuff to notes using make-music.
@@ -11,12 +12,12 @@ create, then write a function that will build the structure for you.
 
 #(define (make-text-script x) 
    (let ((m (make-music-by-name 'TextScriptEvent)))
-     (ly:set-mus-property! m 'text-type 'finger)
-     (ly:set-mus-property! m 'text x)
+    (ly:set-mus-property! m 'direction DOWN) 
+     (ly:set-mus-property! m 'text (make-simple-markup x))
      m))
      
 #(define (add-text-script m x)
-   (if (equal? (ly:music-name m) 'RequestChord)
+   (if (equal? (ly:get-mus-property m 'name) 'EventChord)
        (ly:set-mus-property! m 'elements
                            (cons (make-text-script x)
                                  (ly:get-mus-property m 'elements)))
@@ -29,7 +30,7 @@ create, then write a function that will build the structure for you.
    m)
 
 \score {
-  \apply #(lambda (x) (add-text-script x "6") (display x) x ) \notes { c4-3 }
+  \apply #(lambda (x)  (add-text-script x "6") (display-music x) x ) \notes { c'4-3 }
        \paper{ raggedright = ##t }
 }
 

diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index 68aa570476e4e1d0f7f0bb97588429099a2dd20c..e8c4b9ec4b44e9f3bccd0dfba36936fd3a4d9d00 100644 (file)
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -50,7 +50,7 @@ gcdg =  \notes{ \grace {  g'32-[ c d]}}
 
 % 
 \score {
-  \notes { \time 6/8 \partial 4
+  \notes  { \time 6/8 \partial 4
   \tieUp
   \slurUp
 f4 |

diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly
index d3809d2c6a5736ee60f4a8c59fc4fcf852dd28f9..c89731853db1a05eb344150733bc9a7541db3767 100644 (file)
--- a/input/test/bar-always.ly
+++ b/input/test/bar-always.ly
@@ -8,7 +8,7 @@ automatically insert barlines everywhere.
 
 
 \score {
-       \notes {
+       \notes \relative c''{
                \property Score.barAlways = ##t
                \property Score.defaultBarType = ":|:"
                c4 c4 c4 c4 }

diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly
index 028f10a4c5ce3e35470e028afc620280a9f3cce2..bb1c4c04da4f3d5a89a1f5cf42e8b8f8a05a71c6 100644 (file)
--- a/input/test/blank-notes.ly
+++ b/input/test/blank-notes.ly
@@ -23,7 +23,7 @@ unblanknotes = { \property Voice.NoteHead
 
 
 \score {
-    \notes { c4 d4 
+    \notes \relative c'' { c4 d4 
     \blanknotes e4 f4   \unblanknotes
             g4 a 
             }

diff --git a/input/test/broken-spanner-adjustment.ly b/input/test/broken-spanner-adjustment.ly
deleted file mode 100644 (file)
index 63f7bcb..0000000
--- a/input/test/broken-spanner-adjustment.ly
+++ /dev/null
@@ -1,32 +0,0 @@
-\version "1.7.18"
-\header {
-
-        texidoc = "@cindex Broken Spanner Adjustment
-Broken spanners can be adjusted individually, but
-this requires complicated scheme code.
-" }
-
-#(define (my-callback grob)
-  (let* (
-      (o (ly:get-original grob))
-      (b (if (ly:grob? o) (ly:get-broken-into o) '() ))
-      )
-
-    ;; Call the equivalent of Tie::after_line_breaking
-    ;; if you're using this for other grob-types.
-    
-    (if (and  (>= (length b) 2) (eq? (car (last-pair b)) grob))
-       (ly:set-grob-property! grob 'extra-offset '(4 . -2))
-       )
-  ))
-
-#(debug-enable 'backtrace)
-
-\score {\notes { 
-    \property Voice.Tie \override #'after-line-breaking-callback =
-       #my-callback
-    c1\break ~ c2 ~ c
-}
-    \paper { linewidth= 5.0 \cm }
-    }
-

diff --git a/input/test/caps.ly b/input/test/caps.ly
index 747ec955fb48baf359b32186e115aad517a2c99f..8d1adb6c8fb4973d7ed24babb07e0584a6f11cda 100644 (file)
--- a/input/test/caps.ly
+++ b/input/test/caps.ly
@@ -3,13 +3,15 @@
 texidoc =  "@cindex Capital Letters
 You can set the font to use small caps.
 " }
+
 shapeSC   = \property Lyrics.LyricText \override #'font-shape = #'caps
- shapeNorm = \property Lyrics.LyricText \revert   #'font-shape
+shapeNorm = \property Lyrics.LyricText \revert   #'font-shape
 
 \score { <
- \notes \relative c'' { c4 c4 c8 c8 }
-\lyrics \context Lyrics { 
-  what4 is4 \shapeSC Bud8 -- dha?8 }>
-\paper { raggedright = ##t}
-  }
+  \notes \relative c'' { c4 c4 c8 c8 c8 }
+  \lyrics \context Lyrics { 
+    what4 is4 \shapeSC The8  Ma -- trix? }
+  >
+  \paper { raggedright = ##t}
+}
 

diff --git a/input/test/chord-markup.ly b/input/test/chord-markup.ly
deleted file mode 100644 (file)
index 6c17377..0000000
--- a/input/test/chord-markup.ly
+++ /dev/null
@@ -1,24 +0,0 @@
-\version "1.7.18"
-\header{
-    texidoc = "@cindex Chord Markup
-chord/markup test.
-" }
-
-\paper{ raggedright = ##t }
-
-\score{
-    <
-       \context Staff \notes \relative c'' {
-           c^\markup {  "foe" \raise #3 "bar" }
-           c
-           c^\markup { "foe" \super "12" \sub { "3 4" } }
-           c
-
-           %% broken for now
-           c^\markup { \column << "" ";" "" >>
-                       \column <<  "1"  { \bold "2" "3" } >> }
-               }
-   >
-\paper{raggedright = ##t}
-}
-

diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
index 3742c5ff2996e308581dc8622513763c51521ed7..2a0cc258192158eca64b8cd4387b444415a2bf33 100644 (file)
--- a/input/test/fill-a4.ly
+++ b/input/test/fill-a4.ly
@@ -15,7 +15,9 @@
 \header{ texidoc="@cindex Paper a4 Fill
 This should fill a4 paper. "
 }
+
 \include "paper13.ly"
+
 \score{
        \context Voice \notes\relative c'{
                \clef alto

diff --git a/input/test/ly2dvi-testpage.ly b/input/test/ly2dvi-testpage.ly
index 42f13d23a0fe1f007670ef3a5a2df424fd86342d..2a49aee3e01248ec5dde7069e1522d0f5ab093ac 100644 (file)
--- a/input/test/ly2dvi-testpage.ly
+++ b/input/test/ly2dvi-testpage.ly
@@ -25,11 +25,11 @@ texidoc = "This file tests ly2dvi titling. It should be processed with ly2dvi. "
 
 
 \score {
-       \notes { c1 c1 c1 c1 }
+       \relative c'' \notes { c1 c1 c1 c1 }
 }
 
 \score {
-       \notes { c1 c1 c1 c1 }
+\relative c''  \notes { c1 c1 c1 c1 }
        
        \header {
 

diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index c3abb393b6672c9e06647de3cacc7e2e6ae9c260..5c94334be6211e1b63fb2c0f12f2bb4a370b62be 100644 (file)
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,12 +1,12 @@
 \version "1.7.19"
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
-% check font size -- 26 looks too big, but need to ask.  -gp
+
 \header { texidoc = "@cindex Ancient Mensural Ligatures
 Lilypond can print mensural ligatures."
 }
 
-\include "paper26.ly"
+
 
 % Note that the horizontal alignment of the fermatas obeys to the
 % graphical width of the ligatures rather to the musical moment in time.

diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index 74e4e1ef8817b83ce1489926350e315714a9eccb..e151b2e33fee27a0c01c65e78a554f942c73fbd0 100644 (file)
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -82,10 +82,8 @@ endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata }
 
 \score {
   \notes \transpose c c' \context PianoStaff <
-    \context Staff=up   { \clef "G" s1*32 \enda }
-    \context Staff=down { \clef "F" s1*32 < \context Voice=vup \endb
-                                            \context Voice=vdwn \endc
-                       > }
+    \context Staff=up   { \clef "G"  }
+    \context Staff=down { \clef "F" }
     { \apply #transform {\pat {c e g c' e' }
                          \pat {c d a d' f' }
                         \pat {h, d g d' f' }

diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly
index 0f6765c68d52490238f75a5c27baf52379ec4690..d14a99115c02b59c6567ad20f3762070e4436c79 100644 (file)
--- a/input/test/repeat-manual.ly
+++ b/input/test/repeat-manual.ly
@@ -4,7 +4,7 @@ You can manually control repeat signs and numbers to produce
 unusual output. "
 }
 
-\score { \notes {
+\score { \notes \relative c'' {
 % First a normal looking repeat:
  c2 c
     \property Score.repeatCommands = #'((volta "1."))

diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly
index fd10d39e0fcc34db204f901ee946c291b7925fe7..742acc3bf1a66c4bbec1a90adad5bda568baabac 100644 (file)
--- a/input/test/spanner-after-break-tweak.ly
+++ b/input/test/spanner-after-break-tweak.ly
@@ -1,20 +1,33 @@
 \version "1.7.21"
 
-\header { texidoc = "@cindex Spanner After Break Transparent
+\header { texidoc = "@cindex Spanner after break
+
 To selectively tweak spanners after the linebreaking
 process, Scheme code must be used.  In this simple example, the tie
-after the line break is set transparent. "
-}
+after the line break is moved around. "
+
+      }
 
-\score { \notes {
-    \property Voice.Tie \set #'after-line-breaking-callback
-    = #(lambda (x)
-       (if (eq? (cadr (ly:get-broken-into (ly:get-original x))) x)
-        (ly:set-grob-property! x 'transparent #t)
-       ))
+#(define (my-callback grob)
+  (let* (
+      (o (ly:get-original grob))
+      (b (if (ly:grob? o) (ly:get-broken-into o) '() ))
+      )
+
+    ;; Call the equivalent of Tie::after_line_breaking
+    ;; if you're using this for other grob-types.
     
-    c'1 ~ \break c'1
+    (if (and  (>= (length b) 2) (eq? (car (last-pair b)) grob))
+       (ly:set-grob-property! grob 'extra-offset '(-2 . -1))
+       )
+  ))
+
+#(debug-enable 'backtrace)
 
-  }
-        \paper { raggedright = ##t }
+\score {\notes { 
+    \property Voice.Tie \override #'after-line-breaking-callback =
+       #my-callback
+    c1\break ~ c2 ~ c
 }
+    \paper { raggedright = ##t } 
+    }

diff --git a/input/test/transposing.ly b/input/test/transposing.ly
deleted file mode 100644 (file)
index 72450d0..0000000
--- a/input/test/transposing.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-\version "1.7.18"
-% possible rename to midi-something.
-
-\header { texidoc = "@cindex Transposing
-The transposing property leaves output invariant, but has effect on MIDI. "
-}
-
-\score { 
-  \context Voice \notes\relative c {
-    % btw: this is not how transposing is done in lilypond
-       % this is a transposing performer, i.e. for midi-output only
-       \property Staff.transposing = #0 c
-       \property Staff.transposing = #2 c
-       \property Staff.transposing = #4 c
-       \property Staff.transposing = #5 c
-       \property Staff.transposing = #7 c
-       \property Staff.transposing = #9 c
-       \property Staff.transposing = #11 c
-       \property Staff.transposing = #12 c
-       
-  }
-  \paper { raggedright = ##t } 
-  \midi { }
-}
-

diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly
index 3ec109ad6d5f575efd076e6e6cb6d4a636d8a4c0..29ac880a3b84d640eba89c2cf658df251385f745 100644 (file)
--- a/input/test/unfold-all-repeats.ly
+++ b/input/test/unfold-all-repeats.ly
@@ -20,7 +20,7 @@ mel = \notes \context Staff {
 
 \score { \notes {
   \mel \break
-%%  \apply #unfold-repeats \mel  FIXME
+  \apply #unfold-repeats \mel 
  }
 }
 

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 849f7852273190a5de0e4e536749a02c9c372e5b..9b58b03b8ca68ead74e0e3215d5ea6b808b8468e 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -262,5 +262,5 @@ Mensural_ligature::brew_molecule (SCM)
 
 ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface",
               "A mensural ligature",
-              "delta-pitch flexa-width head-width join-left "
+              "delta-pitch flexa-width head-width join-left join-left-amount "
               "ligature-primitive-callback primitive thickness");