tabify

diff --git a/lily/book.cc b/lily/book.cc
index 7dc79686a9dcfa2ea5963d1b0a875b72d5f1a454..8b71cc3f71e8235d394bc6c81e3c3fa55c4c9409 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -172,7 +172,7 @@ Book::error_found ()
   for (SCM part = bookparts_; scm_is_pair (part); part = scm_cdr (part))
     if (Book *bookpart = unsmob_book (scm_car (part)))
       if (bookpart->error_found ())
-       return true;
+       return true;
 
   return false;
 }
@@ -189,7 +189,7 @@ Book::process (Output_def *default_paper,
 Paper_book *
 Book::process (Output_def *default_paper,
               Output_def *default_layout,
-               Paper_book *parent_part)
+              Paper_book *parent_part)
 {
   Output_def *paper = paper_ ? paper_ : default_paper;
 
@@ -216,49 +216,49 @@ Book::process (Output_def *default_paper,
       /* Process children book parts */
       add_bookpart ();
       for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p))
-        {
-          if (Book *book = unsmob_book (scm_car (p)))
-            {
-              Paper_book *paper_book_part = book
-                ->process (paper, default_layout, paper_book);
-              if (paper_book_part)
-                paper_book->add_bookpart (paper_book_part->self_scm ());
-            }
-        }
+       {
+         if (Book *book = unsmob_book (scm_car (p)))
+           {
+             Paper_book *paper_book_part = book
+               ->process (paper, default_layout, paper_book);
+             if (paper_book_part)
+               paper_book->add_bookpart (paper_book_part->self_scm ());
+           }
+       }
     }
   else
     {
       /* Process scores */
       /* Render in order of parsing.  */
       for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))
-        {
-          if (Score *score = unsmob_score (scm_car (s)))
-            {
-              SCM outputs = score
-                ->book_rendering (paper_book->paper_, default_layout);
-              
-              while (scm_is_pair (outputs))
-                {
-                  Music_output *output = unsmob_music_output (scm_car (outputs));
-                  
-                  if (Performance *perf = dynamic_cast<Performance *> (output))
-                    paper_book->add_performance (perf->self_scm ());
-                  else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
-                    {
-                      if (ly_is_module (score->get_header ()))
-                        paper_book->add_score (score->get_header ());
-                      paper_book->add_score (pscore->self_scm ());
-                    }
-                  
-                  outputs = scm_cdr (outputs);
-                }
-            }
-          else if (Text_interface::is_markup_list (scm_car (s))
-                   || unsmob_page_marker (scm_car (s)))
-            paper_book->add_score (scm_car (s));
-          else
-            assert (0);
-        }
+       {
+         if (Score *score = unsmob_score (scm_car (s)))
+           {
+             SCM outputs = score
+               ->book_rendering (paper_book->paper_, default_layout);
+             
+             while (scm_is_pair (outputs))
+               {
+                 Music_output *output = unsmob_music_output (scm_car (outputs));
+                 
+                 if (Performance *perf = dynamic_cast<Performance *> (output))
+                   paper_book->add_performance (perf->self_scm ());
+                 else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
+                   {
+                     if (ly_is_module (score->get_header ()))
+                       paper_book->add_score (score->get_header ());
+                     paper_book->add_score (pscore->self_scm ());
+                   }
+                 
+                 outputs = scm_cdr (outputs);
+               }
+           }
+         else if (Text_interface::is_markup_list (scm_car (s))
+                  || unsmob_page_marker (scm_car (s)))
+           paper_book->add_score (scm_car (s));
+         else
+           assert (0);
+       }
     }
 
   return paper_book;

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 1f3af9c50773727714a45ce4c92785c66470d21c..82eef1a3ab60b1a46f0bbc8511ceae82eec91b7b 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -39,8 +39,8 @@ public:
   Paper_book *process (Output_def *def_paper,
                       Output_def *def_layout);
   Paper_book *process (Output_def *default_paper,
-                       Output_def *default_layout,
-                       Paper_book *parent_part);
+                      Output_def *default_layout,
+                      Paper_book *parent_part);
   void set_keys ();
 };
 

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 48988380813d419bc3b93d25812ffe02dee1b6d6..936194a5c712794eeb6fcb31ea3c9cfdb8a1f541 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -53,13 +53,13 @@ public:
   Stencil score_title (SCM);
   
   void classic_output_aux (SCM output,
-                           int *first_performance_number);
+                          int *first_performance_number);
   void classic_output (SCM output_channel);
   void output_aux (SCM output_channel,
-                   bool is_first,
-                   bool is_last,
-                   int *first_page_number,
-                   int *first_performance_number);
+                  bool is_first,
+                  bool is_last,
+                  int *first_page_number,
+                  int *first_performance_number);
   void output (SCM output_channel);
 };
 

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index b941c14e1b4ed293cdb9b8e920d5f5c790ff57a4..1962f3b2ec61d71254ac3b03dc61143692c413c9 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -110,19 +110,19 @@ Paper_book::add_performance (SCM s)
 
 void
 Paper_book::output_aux (SCM output_channel,
-                        bool is_first,
-                        bool is_last,
-                        int *first_page_number,
-                        int *first_performance_number)
+                       bool is_first,
+                       bool is_last,
+                       int *first_page_number,
+                       int *first_performance_number)
 {
   if (scm_is_pair (performances_))
     {
       SCM proc = ly_lily_module_constant ("write-performances-midis");
  
       scm_call_3 (proc,
-                  performances (),
-                  output_channel,
-                  scm_long2num (*first_performance_number));
+                 performances (),
+                 output_channel,
+                 scm_long2num (*first_performance_number));
       *first_performance_number += scm_ilength (performances_);
     }
 
@@ -130,27 +130,27 @@ Paper_book::output_aux (SCM output_channel,
     {
       bool is_first_part = is_first;
       for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p))
-        if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p)))
-          {
-            bool is_last_part = (is_last && !scm_is_pair (scm_cdr (p)));
-            pbookpart->output_aux (output_channel,
-                                   is_first_part,
-                                   is_last_part,
-                                   first_page_number,
-                                   first_performance_number);
-            is_first_part = false;
-          }
+       if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p)))
+         {
+           bool is_last_part = (is_last && !scm_is_pair (scm_cdr (p)));
+           pbookpart->output_aux (output_channel,
+                                  is_first_part,
+                                  is_last_part,
+                                  first_page_number,
+                                  first_performance_number);
+           is_first_part = false;
+         }
     }
   else
     {
       if (scores_ == SCM_EOL)
-        return;
+       return;
       paper_->set_variable (ly_symbol2scm ("part-first-page-number"),
-                            scm_long2num (*first_page_number));
+                           scm_long2num (*first_page_number));
       paper_->set_variable (ly_symbol2scm ("part-is-first"),
-                            ly_bool2scm (is_first));
+                           ly_bool2scm (is_first));
       paper_->set_variable (ly_symbol2scm ("part-is-last"),
-                            ly_bool2scm (is_last));
+                           ly_bool2scm (is_last));
       /* Generate all stencils to trigger font loads.  */
       *first_page_number += scm_ilength (pages ());
     }
@@ -162,10 +162,10 @@ Paper_book::output (SCM output_channel)
   int first_page_number = robust_scm2int (paper_->c_variable ("first-page-number"), 1);
   int first_performance_number = 0;
   output_aux (output_channel,
-              true,
-              true,
-              &first_page_number,
-              &first_performance_number);
+             true,
+             true,
+             &first_page_number,
+             &first_performance_number);
 
   SCM scopes = SCM_EOL;
   if (ly_is_module (header_))
@@ -201,15 +201,15 @@ Paper_book::output (SCM output_channel)
 
 void
 Paper_book::classic_output_aux (SCM output,
-                                int *first_performance_number)
+                               int *first_performance_number)
 {
   if (scm_is_pair (performances_))
     {
       SCM proc = ly_lily_module_constant ("write-performances-midis");
       scm_call_3 (proc,
-                  performances (),
-                  output,
-                  scm_long2num (*first_performance_number));
+                 performances (),
+                 output,
+                 scm_long2num (*first_performance_number));
       *first_performance_number += scm_ilength (performances_);
     }
   
@@ -525,51 +525,51 @@ Paper_book::systems ()
   if (scm_is_pair (bookparts_))
     {
       for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p))
-        if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p)))
-          systems_ = scm_append_x (scm_list_2 (systems_, pbookpart->systems ()));
+       if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p)))
+         systems_ = scm_append_x (scm_list_2 (systems_, pbookpart->systems ()));
     }
   else
     {
       SCM specs = get_system_specs ();
       for (SCM s = specs; scm_is_pair (s); s = scm_cdr (s))
-        {
-          if (Paper_score *pscore = dynamic_cast<Paper_score*> (unsmob_music_output (scm_car (s))))
-            {
-              SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
-              system_list = scm_reverse (system_list);
-              systems_ = scm_append (scm_list_2 (system_list, systems_));
-            }
-          else
-            {
-              systems_ = scm_cons (scm_car (s), systems_);
-            }
-        }
+       {
+         if (Paper_score *pscore = dynamic_cast<Paper_score*> (unsmob_music_output (scm_car (s))))
+           {
+             SCM system_list = scm_vector_to_list (pscore->get_paper_systems ());
+             system_list = scm_reverse (system_list);
+             systems_ = scm_append (scm_list_2 (system_list, systems_));
+           }
+         else
+           {
+             systems_ = scm_cons (scm_car (s), systems_);
+           }
+       }
       systems_ = scm_reverse (systems_);
 
       /* backwards compatibility for the old page breaker */
       int i = 0;
       Prob *last = 0;
       for (SCM s = systems_; scm_is_pair (s); s = scm_cdr (s))
-        {
-          Prob *ps = unsmob_prob (scm_car (s));
-          ps->set_property ("number", scm_from_int (++i));
-          
-          if (last
-              && to_boolean (last->get_property ("is-title"))
-              && !scm_is_number (ps->get_property ("penalty")))
-            ps->set_property ("penalty", scm_from_int (10000));
-          last = ps;
-          
-          if (scm_is_pair (scm_cdr (s)))
-            {
-              SCM perm = ps->get_property ("page-break-permission");
-              Prob *next = unsmob_prob (scm_cadr (s));
-              if (perm == SCM_EOL)
-                next->set_property ("penalty", scm_from_int (10001));
-              else if (perm == ly_symbol2scm ("force"))
-                next->set_property ("penalty", scm_from_int (-10001));
-            }
-        }
+       {
+         Prob *ps = unsmob_prob (scm_car (s));
+         ps->set_property ("number", scm_from_int (++i));
+         
+         if (last
+             && to_boolean (last->get_property ("is-title"))
+             && !scm_is_number (ps->get_property ("penalty")))
+           ps->set_property ("penalty", scm_from_int (10000));
+         last = ps;
+         
+         if (scm_is_pair (scm_cdr (s)))
+           {
+             SCM perm = ps->get_property ("page-break-permission");
+             Prob *next = unsmob_prob (scm_cadr (s));
+             if (perm == SCM_EOL)
+               next->set_property ("penalty", scm_from_int (10001));
+             else if (perm == ly_symbol2scm ("force"))
+               next->set_property ("penalty", scm_from_int (-10001));
+           }
+       }
     }
 
   return systems_;
@@ -585,8 +585,8 @@ Paper_book::pages ()
   if (scm_is_pair (bookparts_))
     {
       for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p))
-        if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p)))
-          pages_ = scm_append_x (scm_list_2 (pages_, pbookpart->pages ()));
+       if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p)))
+         pages_ = scm_append_x (scm_list_2 (pages_, pbookpart->pages ()));
     }
   else
     {
@@ -595,15 +595,15 @@ Paper_book::pages ()
 
       /* set systems_ from the pages */
       if (systems_ == SCM_BOOL_F)
-        {
-          systems_ = SCM_EOL;
-          for (SCM p = pages_; scm_is_pair (p); p = scm_cdr (p))
-            {
-              Prob *page = unsmob_prob (scm_car (p));
-              SCM systems = page->get_property ("lines");
-              systems_ = scm_append (scm_list_2 (systems_, systems));
-            }
-        }
+       {
+         systems_ = SCM_EOL;
+         for (SCM p = pages_; scm_is_pair (p); p = scm_cdr (p))
+           {
+             Prob *page = unsmob_prob (scm_car (p));
+             SCM systems = page->get_property ("lines");
+             systems_ = scm_append (scm_list_2 (systems_, systems));
+           }
+       }
     }
   return pages_;
 }

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 553d6c7dc4c7cfd94502004ccb6b460e6dab3b49..58c8720d84421e8693b8b8e42c49b82a46d1d5dd 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -67,9 +67,9 @@
   ;; add them first to a dedicated bookpart
   (if (pair? (ly:parser-lookup parser 'toplevel-scores))
       (begin
-        (add-bookpart (ly:make-book-part
-                       (ly:parser-lookup parser 'toplevel-scores)))
-        (ly:parser-define! parser 'toplevel-scores (list))))
+       (add-bookpart (ly:make-book-part
+                      (ly:parser-lookup parser 'toplevel-scores)))
+       (ly:parser-define! parser 'toplevel-scores (list))))
   (add-bookpart book-part))
 
 (define-public (collect-scores-for-book parser score)
@@ -77,7 +77,7 @@
    parser 'toplevel-scores
    (cons score (ly:parser-lookup parser 'toplevel-scores))))
 
-(define (collect-music-aux score-handler parser music)
+(define-public (collect-music-aux score-handler parser music)
   (define (music-property symbol)
     (let ((value (ly:music-property music symbol)))
       (if (not (null? value))