lilypond-1.3.68

diff --git a/input/test/between-systems.ly b/input/test/between-systems.ly
new file mode 100644 (file)
index 0000000..1f72c7a
--- /dev/null
+++ b/input/test/between-systems.ly
@@ -0,0 +1,11 @@
+
+\score {
+\notes { c1
+
+       \context Score \outputproperty #(make-type-checker 'paper-column-interface)
+               #'between-system-string = #"(pagebreak)\n\n"
+       \break
+
+c1 }
+
+}

diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc
index 62bd6a153d0b2ac5acc8711f8c0bb1f6a5b39441..274a558a07e261a3fb0e3e8d4bf4e13d25dc0f8c 100644 (file)
--- a/lily/line-of-score.cc
+++ b/lily/line-of-score.cc
@@ -101,6 +101,17 @@ Line_of_score::output_lines ()
          progress_indication (to_str (i));
          progress_indication ("]");
        }
+
+      if (i < broken_into_l_arr_.size () - 1)
+       {
+         SCM lastcol =  gh_car (line_l->get_elt_pointer ("columns"));
+         Score_element*  e = unsmob_element (lastcol);
+         SCM inter = e->get_elt_property ("between-system-string");
+         if (gh_string_p (inter))
+           {
+             pscore_l_->outputter_l_->output_string (inter);         
+           }
+       }
     }
 }
 
@@ -179,7 +190,6 @@ Line_of_score::add_column (Paper_column*p)
   set_elt_pointer ("columns",  gh_cons (p->self_scm_, cs));
 
   Axis_group_interface (this).add_element (p);
-  typeset_element (p);
 }
 
 

diff --git a/scm/lily.scm b/scm/lily.scm
index 80e3ffeb6ae74ac8903a06ce9146444c95a2ec4f..7479ba214e8fddda94e1eb7b2e6ef04ed8205617 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -229,9 +229,15 @@
 
 
 ; Make a function that checks score element for being of a specific type. 
-(define (make-type-checker name)
+(define (make-type-checker symbol)
   (lambda (elt)
-    (not (not (memq name (ly-get-elt-property elt 'interfaces))))))
+    (display  symbol)
+    (if (eq? #t (ly-get-elt-property elt symbol))
+              #t
+       #f)
+    ))
+
+  
 
        
 ;;;;;;;;;;;;;;;;;;; TeX output
@@ -373,7 +379,7 @@
       (string-append"\\vbox to " (number->dim ht) "{\\hbox{%\n"))
 
   (define (stop-line) 
-    "}\\vss}\\interscoreline")
+    "}\\vss}\\interscoreline\n")
   (define (stop-last-line)
     "}\\vss}")
   (define (filledbox breapth width depth height)