(all-grob-descriptions): less padding.

diff --git a/ChangeLog b/ChangeLog
index 8f70984aca86367a8dbd57425670399bac634517..c952238b38341c983c5cd139a06f6dda62273ccb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-01-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/system.cc (set_loose_columns): use the right prebroken cols
+       for interpolating loose column position.
+
+       * lily/text-spanner.cc (brew_molecule): default to no vertical
+       lines.
+
+       * lily/ottava-bracket.cc (brew_molecule): vertical line doesn't
+       take space.
+
+       * scm/define-grobs.scm (all-grob-descriptions): less padding.
+
 2004-01-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/axis-group-engraver.cc: Include warn.hh (compile fix).
@@ -5,11 +18,11 @@
 2004-01-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/axis-group-engraver.cc (finalize): extra check; if
-       process_music() is never called, then staffline_ == 0.
+       process_music () is never called, then staffline_ == 0.
 
        * lily/simultaneous-music-iterator.cc (pending_moment): don't
        check run_always ().
-
+       
        * VERSION: release 2.1.13
 
        * input/regression/note-head-style.ly (pattern): cleanup.

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 483e8161a52231ce3b5667809cf581999770e3e1..f52b1fe6ee312954f5b4145d91a914e05ba862a5 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -423,12 +423,12 @@ require them to be twice the thickness of the staff lines. The same
 mechanism can be used to adjust a setting globally. By issuing the
 following command, the entire piece is now formatted with thicker stems:
 @example
-    \property Score.Stem \override #'thickness = #2.0 
+    \property Score.Stem \override #'thickness = #3.0 
 @end example
 
 @lilypond
 \score { \notes \relative c'' {
-    \property Score.Stem \override #'thickness = #2.0 
+    \property Score.Stem \override #'thickness = #3.0 
     \once\property Voice. DynamicLineSpanner  \override #'padding = #4.0 
 \stemUp
     a4_\f f,8
@@ -450,7 +450,7 @@ example above is calculated by the function
 this function by a more advanced one, we could issue
 @example
     \property Voice.DynamicLineSpanner \override #'Y-offset-callbacks
-       = #`(,gee-whiz-gadget)
+       = #(list gee-whiz-gadget)
 @end example
 
 @noindent

diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly
index 5956919c966a7c8678933eec815cdb452f3f7837..a9e2c47327ab2beeff1ed30452257c1ddc27d670 100644 (file)
--- a/input/no-notation/recording.ly
+++ b/input/no-notation/recording.ly
@@ -7,7 +7,6 @@ how to skip the rendering and outputting step of the process, using
 @code{ly:run-translator}."
 
 }
-\include "english.ly"
 
 theMusic = \context Staff \notes { c4 d8-. }
 

diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index a38d2c8defb8e5209ab295fa60730cc4acc2d17e..d47c124ee6fad089fe28fbedb0d78a492edfd8a9 100644 (file)
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -6,23 +6,21 @@
 \score {
     \notes {
        \property Staff.Custos \set #'neutral-position = #4
-       \property Staff.Custos \set #'neutral-direction = #-1
-       \property Staff.Custos \set #'adjust-if-on-staffline = ##t
 
        \property Staff.Custos \set #'style = #'hufnagel
-       c'1^"Custos style = \#'hufnagel"
+       c'1^"hufnagel"
        \break < d' a' f''>1
 
        \property Staff.Custos \set #'style = #'medicaea
-       c'1^"Custos style = \#'medicaea"
+       c'1^"medicaea"
        \break < d' a' f''>1
 
        \property Staff.Custos \set #'style = #'vaticana
-       c'1^"Custos style = \#'vaticana"
+       c'1^"vaticana"
        \break < d' a' f''>1
 
        \property Staff.Custos \set #'style = #'mensural
-       c'1^"Custos style = \#'mensural"
+       c'1^"mensural"
        \break < d' a' f''>1
     }
     \paper {

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index d8011816eb0ca3d424a02798a9ea94f90ce8ac44..bf6e3cc7b0a78180654b9152f3cbbe0cd0442d33 100644 (file)
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -58,6 +58,11 @@ with @code{Staff.ottavation}.
   #(set-octavation -1)
   \property Staff.ottavation = #"8"
   c,,16
+  #(set-octavation 0)
+  c'16
+  #(set-octavation -1)
+  \property Staff.ottavation = #"8"
+  g,,16
 }
 }
 

diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly
index 85e58d003047feab064addcf4f3b48834ad677a8..9016f3f44bd32de617bb1c288488c0621b08351d 100644 (file)
--- a/input/regression/tie-busy-grobs.ly
+++ b/input/regression/tie-busy-grobs.ly
@@ -2,7 +2,10 @@
 \header {
 
 texidoc = "Tie engraver uses @code{busyGrobs} to keep track of
-note heads. Test if this queue works by throwing many  mixed tuplets at it." 
+note heads. Test if this queue works by throwing many  mixed tuplets at it.
+
+This test may show collisions between tie and beam. 
+" 
 
 }
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e1f168011f562814753bce2244e232b885cb48de..4c9a5ff024552dd74f73b81202c9c0ef7bf0e97f 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1082,7 +1082,7 @@
        (text-repeat-if-broken . #t)
        (shorten-pair . (0.0 . -0.6))
        (staff-padding . 1.0)
-       (padding  . 1.0)
+       (padding  . 0.5)
        (enclose-bounds . #t)
        (minimum-length . 1.0)
        (dash-fraction . 0.3)

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index ba78fc0ed7610c6739b6856fff31445581fdf4bc..24986145f0b9e35a23099e001f3a5b886bc27da0 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -791,3 +791,12 @@ Rest can contain a list of beat groupings
      (ly:set-grob-property! grob 'balloon-text-props '((font-family . roman)))
 
      ))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+
+
+(define-public (determine-split-list ev1 ev2 state)
+
+#f  )

diff --git a/scm/paper.scm b/scm/paper.scm
index 2b5e18024f5cdb85fda69c1d39ad9b6b633dbd5c..80a0724bfb1cf4fdc76f61390bf8e9b11b8c283b 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -51,6 +51,8 @@
 
 
 (define (set-paper-dimensions m w h)
+  "M is a module (ie. paper->scope_ )"
+  
   (let*
       ( (mm (eval 'mm m)) )