new file.

diff --git a/ChangeLog b/ChangeLog
index 73d90a8f334185d567481980c52d0a6b8e4f8dc0..5d9d85022620d6d7446e9a3a10d4f20ef06b30b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+2003-03-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * input/regression/tie-chord-partial.ly: new file.
+
 2003-03-05  Heikki Junes <hjunes@cc.hut.fi>
 
        * lilypond.words: add 3
 
 2003-03-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scm/new-markup.scm (markup-function-list): add finger-markup
+
+       * input/tutorial/brahms-tweaked.ly: new markup 
+
        * scm/bass-figure.scm (brew-one-figure): bugfix for large bass figures 
 
        * scm/new-markup.scm (brew-new-markup-molecule): robustness: don't

diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly
new file mode 100644 (file)
index 0000000..cf2df46
--- /dev/null
+++ b/input/regression/tie-chord-partial.ly
@@ -0,0 +1,31 @@
+\header {
+
+texidoc = "Tieing only parts of chords is possible. It requires
+putting the Tie engraver at Thread level, and redirecting untied notes
+to a different thread."
+
+}
+\version "1.7.13"
+
+\score {
+
+\notes \context Thread \relative c' {
+  < c-~ e \context Thread = "untied" c' > 
+  < c e c'  > 
+}
+
+
+%% comment out New_tie_engraver for lily 1.6
+\paper {
+\translator {
+  \ThreadContext
+  \consists "Tie_engraver"
+  \consists "New_tie_engraver"
+}
+\translator { \VoiceContext
+  \remove "Tie_engraver"
+  \remove "New_tie_engraver"
+}
+}}
+
+%% new-chords-done %% 

diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly
index 69276ff592768516de3c99e5fbbc4d7bc8e742e9..5c63cae358c2be4631695d03ce9fd141b5b301b1 100644 (file)
--- a/input/tutorial/brahms-tweaked.ly
+++ b/input/tutorial/brahms-tweaked.ly
@@ -11,7 +11,7 @@
    
 
             \property Voice.Fingering \revert #'extra-offset
-            fis16 a-)^" "^#'(finger "5") } \\
+            fis16 a-)^" "^\markup { \finger "5" } } \\
         {
             \dynamicUp
             \property Voice.DynamicLineSpanner \override #'padding = #5.0

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 9bb8ce11da116aeece2d40130aaf58742a734d0c..e02eb889de2fa5931aa981f72ef52f9a920d6611 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -67,7 +67,7 @@ Tie_engraver::Tie_engraver ()
 bool
 Tie_engraver::try_music (Music *mus)
 {
-  if(mus->is_mus_type( "tie-event"))
+  if (mus->is_mus_type ("tie-event"))
     {
       event_ = mus;
     }

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index ad4a34a745a66ffcfe6ab38c16565ca8682b53d1..dea79e240459afa3c498192c9dead10a8332b8eb 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -100,6 +100,14 @@ for the reader.
     ))
 
 
+(define-public (finger-markup grob props . rest)
+  (interpret-markup grob
+                   (cons (list '(font-relative-size . -3)
+                               '(font-family . number))
+                               props)
+                   (car rest)))
+
+
 (define-public fontsize-markup (set-property-markup 'font-relative-size))
 (define-public magnify-markup (set-property-markup 'font-magnification))
 
@@ -110,6 +118,7 @@ for the reader.
 (define-public roman-markup
   (font-markup 'font-family 'roman))
 
+
 (define-public huge-markup
   (font-markup 'font-relative-size 2))
 (define-public large-markup
@@ -390,12 +399,14 @@ for the reader.
    
    (cons super-markup (list markup?))
    (cons normal-size-super-markup (list markup?))
-   
+
+   (cons finger-markup (list markup?))
    (cons bold-markup (list markup?))
    (cons italic-markup (list markup?))
    (cons roman-markup (list markup?))
    (cons number-markup (list markup?))
    
+   
    (cons column-markup (list markup-list?))
    (cons center-markup (list markup-list?))
    (cons line-markup  (list markup-list?))