* scripts/lilypond-book.py (output_dict): remove support for the

EPS option.

* scm/define-grobs.scm (all-grob-descriptions): add X-extent for
VerticalAlignment and VerticalAxisGroup this fixes the size
computations for the entire system.

* input/les-nereides.ly (bass): remove superfluous fontSize.

* scripts/lilypond-book.py (make_lilypond_file): \lilypondfile{}
causes directory of file to be added to include path.

* input/regression/beam-break.ly: test single stem beams.

diff --git a/ChangeLog b/ChangeLog
index 59aa336c062c603940965e2eac7df362a265d622..ef433d11b107ef6ef6773c9881f15980228c16ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2003-09-18  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scripts/lilypond-book.py (output_dict): remove support for the
+       EPS option.
+
+       * scm/define-grobs.scm (all-grob-descriptions): add X-extent for
+       VerticalAlignment and VerticalAxisGroup this fixes the size
+       computations for the entire system.
+ 
+       * input/les-nereides.ly (bass): remove superfluous fontSize.
+
+       * scripts/lilypond-book.py (make_lilypond_file): \lilypondfile{}
+       causes directory of file to be added to include path.
+
+       * input/regression/beam-break.ly: test single stem beams.
+
        * input/regression/system-start-bracket.ly: fix.
 
        * lily/beam.cc (set_stem_lengths): single-stem-beam fix.

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 28b12d2a9ec2bbde54ff0ba4a6351d78b1c4e367..39e45ce83a6179dfb109a562dfcbc1cd25afc5de 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -254,7 +254,7 @@ saves the LilyPond code to @var{filename}.  By default, a hash value
 of the code is used.
 
 @item 11pt
-@lilypond[11pt, eps]
+@lilypond[11pt]
 \relative c' {
   r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] |
   d16[ g, a b] c[ a b g] d'8[ g f\prall g]
@@ -262,7 +262,7 @@ of the code is used.
 @end lilypond
 
 @item 13pt
-@lilypond[13pt, eps]
+@lilypond[13pt]
 \relative c' {
   r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] |
   d16[ g, a b] c[ a b g] d'8[ g f\prall g]
@@ -270,21 +270,21 @@ of the code is used.
 @end lilypond
 
 @item 16pt
-@lilypond[16pt, eps]
+@lilypond[16pt]
 \relative c' {
   r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] |
 }
 @end lilypond
 
 @item 20pt
-@lilypond[20pt, eps]
+@lilypond[20pt]
 \relative c' {
   r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] |
 }
 @end lilypond
 
 @item 26pt
-@lilypond[26pt, eps]
+@lilypond[26pt]
 \relative c' {
   r16 c[ d e] f[ d e c] g'8[ c] b[\prall c] |
 }

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index da49e0a61aee82589f09d751c89beacac6e81917..de5d827a54ec09a112adffba5a0963038ebb1e96 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -62,11 +62,12 @@ treble = \new Voice \notes\relative c''{
     \tieUp
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
     \grace {
-  \property Voice.Stem \override #'stroke-style = #"grace"
+       \property Voice.Stem \override #'stroke-style = #"grace"
   
          cis8
         
          %\stemBoth Hmm
+       
         \property Voice.Stem \set #'direction = #0
         
           a16[-5( fis dis]
@@ -76,7 +77,8 @@ treble = \new Voice \notes\relative c''{
         % the small grace in lower staff comes after us
         s32
     
-  \property Voice.Stem \revert #'stroke-style }
+       \property Voice.Stem \revert #'stroke-style
+    }
 
 
     \stemUp
@@ -180,18 +182,18 @@ bass =  \new Voice \notes\relative c{
     >>
     
     \grace {
-  \property Voice.Stem \override #'stroke-style = #"grace"
+       \property Voice.Stem \override #'stroke-style = #"grace"
   
         s8
         s16 s s
        s32 s s
        s s s
        \clef bass
-        \property Voice.fontSize = #-3
        <e,,, e,>32(
     
-  \property Voice.Stem \revert #'stroke-style }
- <gis' e>2)
+       \property Voice.Stem \revert #'stroke-style
+    }
+    <gis' e>2)
     
     | %5
     \slurUp

diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index 4b9e74cdef76ff1aaac9cda3016cb29382d3fbe6..4f66eaf30801ebd37301beb8c979fac6f262714c 100644 (file)
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -9,4 +9,5 @@
 
 \score { \notes \relative c''  {
     \property Score.forbidBeamBreak = ##f
-    c2. c8[ c8 \break c8 c8]   } }
+   \time 3/16 c16-[ d e \break f-] 
+}}

diff --git a/lily/system.cc b/lily/system.cc
index e30a91505e52d158135d99e60ce3e87e98f49a89..aae85ea286aa5c3586d99c33994300a76ad90ad8 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -439,7 +439,7 @@ System::post_processing (bool last_line)
    */
   Interval j (extent (this, X_AXIS));
   Real length = j[RIGHT];
-  
+    
   output_scheme (scm_list_n (ly_symbol2scm ("start-system"),
                          gh_double2scm (length),
                          gh_double2scm (height),
@@ -447,7 +447,6 @@ System::post_processing (bool last_line)
   
   /* Output elements in three layers, 0, 1, 2.
      The default layer is 1. */
-
   {
     Molecule *m = this->get_molecule();
     if (m)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index cf084881c9eb00e116795b18e831359eea92e4c6..a2d25377714be09d86a707071a5c3b4b4d05816c 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1223,6 +1223,7 @@
      . (
        (axes . (1))
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
        (stacking-dir . -1)
        (meta . ((interfaces . (align-interface axis-group-interface spanner-interface))))
        ))
@@ -1231,6 +1232,7 @@
      . (
        (axes . (1))
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)      
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
        
        (meta . ((interfaces . (axis-group-interface spanner-interface))))
        ))

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 17f42366e019daea5cbeef52674487ef449bedd4..fbba449b9de758b90111fb48a2568287d34cdf7d 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -382,12 +382,10 @@ output_dict= {
 
        'latex': {
 
-               'output-lilypond-fragment' : r'''\begin[eps,singleline,%s]{lilypond}
-  \context Staff <
+               'output-lilypond-fragment' : r'''\begin[singleline,%s]{lilypond}
     \context Voice{
       %s
     }
-  >
 \end{lilypond}''',
                'output-filename' : r'''\verb+%s+:\\
 %% %s
@@ -405,7 +403,6 @@ output_dict= {
                'output-default-post': "\\def\postLilyPondExample{}\n",
                'output-default-pre': "\\def\preLilyPondExample{}\n",
                'usepackage-graphics': '\\usepackage{graphics}\n',
-               'output-eps': '\\noindent\\parbox{\\lilypondepswidth{%(fn)s.eps}}{\includegraphics{%(fn)s}}',
                'output-noinline': r'''
 %% generated: %(fn)s.eps
 ''',
@@ -908,7 +905,10 @@ def make_lilypond_file (m):
                options = []
        (content, nm) = find_file (m.group ('filename'))
        options.append ("filename=%s" % nm)
-
+       (path, base) = os.path.split (nm)
+       
+       if path not in include_path:
+               include_path.append (path)
 
        return [('lilypond', content, options)]
        
@@ -1158,13 +1158,10 @@ def format_lilypond_block (chunk):
        if 'noinline' in opts:
                s = 'output-noinline'
        elif format == 'latex':
-               if 'eps' in opts:
-                       s = 'output-eps'
+               if 'quote' in opts:
+                       s = 'output-latex-quoted'
                else:
-                       if 'quote' in opts:
-                               s = 'output-latex-quoted'
-                       else:
-                               s = 'output-latex-noquote'
+                       s = 'output-latex-noquote'
        elif format == 'texi':
                if 'quote' in opts:
                        s = 'output-texi-quoted'