* input/test/markup-score.ly: New file.

* lily/parser.yy (markup): Use it to grok \score.

diff --git a/input/test/markup-score.ly b/input/test/markup-score.ly
index 81b32a54ef84827730a5769d519abf14389542d5..098201a324db77678ae811df236c372556b51f01 100644 (file)
--- a/input/test/markup-score.ly
+++ b/input/test/markup-score.ly
@@ -1,5 +1,8 @@
 \header {
     %% WIP
+
+    %% this would be more useful as a footnote, but we don't have
+    %% (sensible) header/footer+footnotes yet (2.3.1).
     texidoc = "Use \\score block as markup command."
 }
 
@@ -23,6 +26,10 @@
     Y CENTER)))
 
 inBed = \paper {
+    %% can't do this, this paper('s fonts) must be notified to the
+    %% main/current book, and e output in the header.
+    %% #(paper-set-staff-size (* 11.0 pt))
+    
     raggedright = ##t
     linewidth = 40\mm
     indent = 0 \mm

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 88eb8bb75c246a8e0264616a18b187c430b93ecd..bb802e623f9b471c560e7cd2e540e4d337a0f21e 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -98,6 +98,19 @@ Paper_book::output (String outname)
   int page_count = scm_ilength (pages);
   out->output_header (paper, scopes (0), page_count, false);
 
+#if 0
+  /* Ugh; fixme.  */
+  int paper_count = papers_.size ();
+  for (int i = 1; i < paper_count; i ++)
+    {
+      SCM fonts = papers_[i]->font_descriptions ();
+      out->output_scheme (scm_list_3 (ly_symbol2scm ("define-fonts"),
+                                     papers_[i]->self_scm (),
+                                     //FIXME:
+                                     ly_quote_scm (ly_list_qsort_uniq_x (fonts))));
+    }
+#endif
+
   for (SCM s = pages; s != SCM_EOL; s = ly_cdr (s))
     {
       Page *p = unsmob_page (ly_car (s));

diff --git a/lily/parser.yy b/lily/parser.yy
index 842244079cf22cffe26fb2821e70e98a24b1194e..8575eb2071c70b690d256aa9bb64598b7cbd227d 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2451,7 +2451,10 @@ markup:
                $$ = $1;
        }
        | score_block {
-               // WIP -- arbitrary, shoul also allow \book or Composite_music.
+               /* WIP this is a bit arbitrary,
+                  we should also allow \book or Composite_music.
+                  However, you'd typically want to change paper
+                  settings, and need a \score block anyway.  */
                Score *score = $1;
                Book *book = new Book;
                book->scores_.push (score);