From: Neil Puttock <n.puttock@gmail.com>
Date: Sun, 1 Nov 2009 23:22:25 +0000 (+0000)
Subject: Typeset all systems when inlining a score using \markup \score.
X-Git-Tag: release/2.13.7-0~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dff80dee029901d55101cb7991ee53f03ab06efa;p=lilypond.git

Typeset all systems when inlining a score using \markup \score.

Use baseline-skip to set space between systems.
---

diff --git a/input/regression/markup-score-multi-system.ly b/input/regression/markup-score-multi-system.ly
new file mode 100644
index 0000000000..068af7639e
--- /dev/null
+++ b/input/regression/markup-score-multi-system.ly
@@ -0,0 +1,22 @@
+\version "2.13.7"
+
+\header {
+  texidoc = "\\markup \\score displays all systems.  Spacing between
+  systems is set using @code{baseline-skip}.
+"
+}
+
+
+\markup {
+  \override #'(baseline-skip . 10)
+  \score {
+    \new Staff \relative c' {
+      c4 d e f \break
+      g1
+    }
+    \layout {
+      indent = 0
+      ragged-right = ##t
+    }
+  }
+}
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 1c63498c88..08c24bb577 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -531,7 +531,7 @@ grestore
 (define-builtin-markup-command (score layout props score)
   (ly:score?)
   music
-  ()
+  ((baseline-skip))
   "
 @cindex inserting music into text
 
@@ -576,11 +576,13 @@ Inline an image of music.
   }
 }
 @end lilypond"
-  (let* ((output (ly:score-embedded-format score layout)))
+  (let ((output (ly:score-embedded-format score layout)))
 
     (if (ly:music-output? output)
-	(paper-system-stencil
-	 (vector-ref (ly:paper-score-paper-systems output) 0))
+	(stack-stencils Y DOWN baseline-skip
+			(map paper-system-stencil
+			     (vector->list
+			      (ly:paper-score-paper-systems output))))
 	(begin
 	  (ly:warning (_"no systems found in \\score markup, does it have a \\layout block?"))
 	  empty-stencil))))
diff --git a/scm/lily.scm b/scm/lily.scm
index 5fb635b06c..7ed8fe72d7 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -425,6 +425,7 @@ LilyPond safe mode.  The syntax is the same as `define*-public'."
 	(,ly:music-output? . "music output")
 	(,ly:pitch? . "pitch")
 	(,ly:translator? . "translator")
+        (,ly:score? . "score")
 	(,ly:simple-closure? . "simple closure")
 	(,ly:skyline-pair? . "pair of skylines")
 	(,ly:stencil? . "stencil")