lilypond-1.1.44

diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 1b62555d0379d9838e84a308b3667976f0416940..847ae9ec1220263ad6ef979dfe822a3035774ec2 100644 (file)
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -37,6 +37,7 @@ public:
   void output_scheme (SCM scm);
   void start_line (Real height);
   void stop_line ();
+  void stop_last_line ();
   void switch_to_font (String fontname);
 
   Paper_stream* outstream_l_;

diff --git a/lily/p-score.cc b/lily/p-score.cc
index a3194757f2e7ce707fb762cd7f01439e64931cd4..4edfd1b3e9e8de9bd7495f27540d32178c4eb275 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -221,8 +221,7 @@ Paper_score::process ()
 
       line_l->post_processing ();
        *mlog << i << flush;
-      line_l->output_all ();
-
+      line_l->output_all (i + 1 == lines.size());
       if (experimental_features_global_b)
        *mlog << '(' << elem_p_arr_.size () + span_p_arr_.size () << ')';
       

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 4337ad92d64ca226b68347a567a4629fc882c38b..96ba69012f78fb24a8d4891b999c0a0614ae2808 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -292,3 +292,10 @@ Paper_outputter::stop_line ()
   SCM scm = gh_list (ly_symbol ("stop-line"), SCM_UNDEFINED);
   output_scheme (scm);
 }
+
+void
+Paper_outputter::stop_last_line ()
+{
+  SCM scm = gh_list (ly_symbol ("stop-last-line"), SCM_UNDEFINED);
+  output_scheme (scm);
+}

diff --git a/scm/lily.scm b/scm/lily.scm
index 0e30e6190ca83b59a4f2581c34e2b0b59adcd4fa..74d1d2f10d0facc8ba008423b0913e91915bbbda 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -253,7 +253,8 @@
     )
   (define (stop-line) 
     "}\\vss}\\interscoreline")
-
+  (define (stop-last-line)
+    "}\\vss}")
   (define (filledbox breapth width depth height) 
     (string-append 
      "\\kern" (number->dim (- breapth))
@@ -301,6 +302,7 @@
            (define select-font ,select-font)
            (define start-line ,start-line)
            (define stop-line ,stop-line)
+           (define stop-last-line ,stop-last-line)
            (define text ,text)
            (define tuplet ,tuplet)
            (define volta ,volta)
@@ -328,6 +330,7 @@
        ((eq? action-name 'start-line) start-line)
        ((eq? action-name 'stem) stem)
        ((eq? action-name 'stop-line) stop-line)
+       ((eq? action-name 'stop-last-line) stop-last-line)
        ((eq? action-name 'volta) volta)
        (else (error "unknown tag -- PS-TEX " action-name))
        )
@@ -520,6 +523,7 @@
            (define start-line ,start-line)
            (define stem ,stem)
            (define stop-line ,stop-line)
+           (define stop-last-line ,stop-line)
            (define text ,text)
            ))
        ((eq? action-name 'tuplet) tuplet)

diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py
index fd535434c8420386560231d05651a0215cd6efa1..46b6a61778669a897cbfc24bbc732990d2c84321 100644 (file)
--- a/scripts/mudela-book.py
+++ b/scripts/mudela-book.py
@@ -7,10 +7,6 @@
 #  help-gnu-music@gnu.org
 #
 #  TODO:
-# * Spacing before and after mudela blocks should be fixed. No empy lines
-#   before and after the mudela block should make just little space between
-#   music and text, one or more empy lines should make bigger space, like
-#   between paragraphs.
 # * center option (??)
 # * make mudela-book understand usepackage{geometry}
 # * check that linewidth set in \paper is not wider than actual linewidth?
@@ -396,21 +392,24 @@ class Tex_output:
     def write_outfile(self):
         file = open(self.output_fn+'.latex', 'w')
         file.write('% Created by mudela-book\n')
+        last_line = None
         for line in self.__lines:
             if type(line)==type([]):
-                if line[0] == 'tex':
-                    #\\def\\interscoreline{}
+                if last_line == '\n':
+                    file.write(r'\vspace{0.5cm}')
+                if line[0] == 'tex':                    
                     file.write('\\preMudelaExample \\input %s \\postMudelaExample\n'\
-                              # TeX applies the prefix of the main source automatically.
                                % (line[1]+'.tex'))
-#                               % (outdir+line[1]+'.tex'))
                 if line[0] == 'eps':
                     ps_dim = ps_dimention(outdir+line[1]+'.eps')
                     file.write('\\noindent\\parbox{%ipt}{\includegraphics{%s}}\n' \
                                % (ps_dim[0], line[1]+'.eps'))
-#                               % (ps_dim[0], outdir+line[1]+'.eps'))
             else:
                 file.write(line)
+            if type(last_line)==type([]):
+                if line=='\n':
+                    file.write(r'\vspace{0.5cm}')
+            last_line = line
         file.close()
 
 # given parameter s="\mudela[some options]{CODE} some text and commands"

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 6ef9ca21b8a03735cc39446ab0b1ab570d115501..794397fcf41b68deed5ece5cd2e95ff0962afd19 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -44,7 +44,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% set up dimensions
-\parindent=0pt
+% mudela-book don't like this:
+%\parindent=0pt
 \newdimen\smallspace
 \newdimen\interlinedist