From: fred <fred>
Date: Tue, 26 Mar 2002 22:25:51 +0000 (+0000)
Subject: lilypond-1.2.7
X-Git-Tag: release/1.5.59~2160
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d93af047573227db144af922faaa7b03d3798584;p=lilypond.git

lilypond-1.2.7
---

diff --git a/lily/bezier.cc b/lily/bezier.cc
index 1e78566783..a73576cfd1 100644
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -16,7 +16,7 @@
 #include "paper-def.hh"
 #include "debug.hh"
 #include "main.hh"
-#define BEZIER_BOW_DOUT if (check_debug && !monitor->silent_b ("Bezier_bow")) cout
+#define BEZIER_BOW_DOUT if (check_debug && !lily_monitor->silent_b ("Bezier_bow")) cout
 #else
 #define BEZIER_BOW_DOUT cerr
 #endif
@@ -31,6 +31,12 @@
 
  */
 
+
+/*
+  UGH. Clean up debugging junk.
+  */
+
+
 void
 Curve::flipy ()
 {
@@ -99,7 +105,7 @@ void
 Bezier::print () const
 {
 #ifndef NPRINT
-  if (check_debug && !monitor->silent_b ("Bezier_controls"))
+  if (check_debug && !lily_monitor->silent_b ("Bezier_controls"))
     {
       if (control_[1].length ())
         {
@@ -240,9 +246,9 @@ void
 Bezier_bow::calc ()
 {
 #ifndef NPRINT
-//  if (check_debug && !monitor->silent_b ("Bezier_bow_controls"))
-  if (check_debug && !(monitor->silent_b ("Bezier_controls")
-    && monitor->silent_b ("Bezier_bow_controls")))
+//  if (check_debug && !lily_monitor->silent_b ("Bezier_bow_controls"))
+  if (check_debug && !(lily_monitor->silent_b ("Bezier_controls")
+    && lily_monitor->silent_b ("Bezier_bow_controls")))
     {
       cout << "Before transform*********\n";
       print ();
@@ -269,9 +275,9 @@ Bezier_bow::calc ()
   print ();
   transform_back ();
 #ifndef NPRINT
-//  if (check_debug && !monitor->silent_b ("Bezier_bow_controls"))
-  if (check_debug && !(monitor->silent_b ("Bezier_controls")
-    && monitor->silent_b ("Bezier_bow_controls")))
+//  if (check_debug && !lily_monitor->silent_b ("Bezier_bow_controls"))
+  if (check_debug && !(lily_monitor->silent_b ("Bezier_controls")
+    && lily_monitor->silent_b ("Bezier_bow_controls")))
     {
       cout << "After transform*********\n";
       print ();
@@ -544,7 +550,7 @@ Bezier_bow::print () const
 {
 #ifndef NPRINT
   Bezier::print ();
-  if (check_debug && !monitor->silent_b ("Bezier_bow_controls"))
+  if (check_debug && !lily_monitor->silent_b ("Bezier_bow_controls"))
     {
       cout << "Bezier_bow\n";
       cout << "Encompass: ";
diff --git a/lily/bow.cc b/lily/bow.cc
index a72e2fe433..f3c4e59eeb 100644
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -26,7 +26,7 @@ Bow::do_brew_molecule_p () const
 {
   Real thick = paper_l ()->get_var ("slur_thickness");
   Array<Offset> c = get_controls ();
-  Real dy = c[3].y () - c[0].y ();
+
   Molecule a;
 
   SCM d =  get_elt_property (dashed_scm_sym);
@@ -35,17 +35,6 @@ Bow::do_brew_molecule_p () const
   else
     a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (SCM_CDR(d)));
 
-  if (check_debug && !monitor->silent_b ("Bow"))
-    {
-      static int i = 1;
-      cout << "******" << i++ << "******" << endl;
-      cout << "c0.y: " << c[0].y () << endl;
-      cout << "c3.y: " << c[3].y () << endl;
-      cout << "dy: " << dy << endl;
-      cout << "dy_f_l: " << dy_f_drul_[LEFT] << endl;
-      cout << "dy_f_r: " << dy_f_drul_[RIGHT] << endl;
-      cout << "dy_f: " << dy_f_drul_[RIGHT] - dy_f_drul_[LEFT] << endl;
-    }
   return new Molecule (a); 
 }
 
diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index aa7178f079..8afb577160 100644
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -86,14 +86,14 @@ Global_translator::run_iterator_on_me (Music_iterator * iter)
 	{
 	  w = iter->next_moment();
 	  DOUT << "proccing: " << w << '\n';
-	  if (!monitor->silent_b ("walking"))
+	  if (!lily_monitor->silent_b ("walking"))
 	    iter->print();
 	}
       
       modify_next (w);
       prepare (w);
       
-      if (!monitor->silent_b ("walking"))
+      if (!lily_monitor->silent_b ("walking"))
 	print();
 
       iter->process_and_next (w);
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 39883f8328..8301c8a5bc 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -544,12 +544,12 @@ String
 Midi_track::data_str () const
 {
   String str = Midi_chunk::data_str ();
-  if (check_debug && !monitor->silent_b ("Midistrings"))
+  if (check_debug && !lily_monitor->silent_b ("Midistrings"))
     str += "\n";
   for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_) 
     {
       str += i->car_->str ();
-      if (check_debug && !monitor->silent_b ("Midistrings"))
+      if (check_debug && !lily_monitor->silent_b ("Midistrings"))
         str += "\n";
     }
   return str;
diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index ba8f161a95..373d49569a 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -44,7 +44,7 @@ Midi_stream::operator << (Midi_item const& midi_c_r)
 {
 //    *this <<midi_c_r.str (); 
   String str = midi_c_r.str ();
-  if (check_debug && !monitor->silent_b ("Midistrings")) 
+  if (check_debug && !lily_monitor->silent_b ("Midistrings")) 
     {
     str = String_convert::bin2hex_str (str) + "\n";
     // ugh, should have separate debugging output with Midi*::print routines
diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 2bf4d1120c..c1051d6019 100644
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -109,9 +109,9 @@ My_lily_lexer::lookup_identifier (String s)
 void
 My_lily_lexer::start_main_input ()
 {  
-  if (!monitor->silent_b ("InitDeclarations") && check_debug)
+  if (!lily_monitor->silent_b ("InitDeclarations") && check_debug)
     print_declarations (true);
-  if (!monitor->silent_b ("InitLexer") && check_debug)
+  if (!lily_monitor->silent_b ("InitLexer") && check_debug)
     set_debug (1);
 
 
diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 61f52df13f..de8b7c66bd 100644
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -60,7 +60,7 @@ My_lily_parser::parse_file (String init, String s)
   *mlog << _ ("Parsing...");
 
   init_parse_b_ = false;
-  set_yydebug (!monitor->silent_b ("Parser") && check_debug);
+  set_yydebug (!lily_monitor->silent_b ("Parser") && check_debug);
   lexer_p_->new_input (init, source_l_);
   do_yyparse ();
 
diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 07fe0330b9..e0565ab7b0 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -85,7 +85,7 @@ Paper_outputter::output_header ()
 
 #ifndef NPRINT
   DOUT << "output_header\n";
-  if (check_debug && !monitor->silent_b ("Guile"))
+  if (check_debug && !lily_monitor->silent_b ("Guile"))
     {
       gh_display (args_scm); gh_newline ();
     }
diff --git a/lily/score-element.cc b/lily/score-element.cc
index 2dab6212bc..d8f254175c 100644
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -138,7 +138,7 @@ Score_element::print() const
 {
 #ifndef NPRINT
   DOUT << classname(this) << "{\n";
-  if (check_debug && !monitor->silent_b ("Score_element"))
+  if (check_debug && !lily_monitor->silent_b ("Score_element"))
     ly_display_scm (element_property_alist_);
   DOUT << "dependencies: " << dependency_size();
   if (original_l_)
diff --git a/lily/scores.cc b/lily/scores.cc
index 5d97d4fef5..23f85ce5bc 100644
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -81,7 +81,7 @@ do_scores()
 	}
       else
 	{
-	  if (!monitor->silent_b ("do_scores"))
+	  if (!lily_monitor->silent_b ("do_scores"))
 	      is_p->print ();
 	  is_p->process();
 	}
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index e27626f40c..8fbb0c1d96 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -26,7 +26,7 @@ $(outdir)/%.ly: %.abc
 $(outdir)/%.dvi: $(outdir)/%.ly
 	$(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
 	-mv $(basename $(<F)).midi $(outdir)
-	
+
 # don't junk intermediate .dvi files.  They're easier to view than
 # .ps or .gif
 .PRECIOUS: $(outdir)/%.dvi
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index d3999a9834..e0682e5b23 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -1,5 +1,8 @@
 #!@PYTHON@
 
+
+# TODO: Rewrite this.  The control structure is too hairy.
+
 """
 =======================================================================
 LilyPond to dvi converter
@@ -468,7 +471,8 @@ class Properties:
         if os.environ.has_key('TMP'):
             this.__set('tmp',os.environ['TMP'],'environment')
 
-        
+
+    def read_titledefs (this):
 	fd=this.get_texfile_path ('titledefs.tex')
         mudefs=[]    
 
@@ -953,7 +957,7 @@ def identify ():
     sys.stderr.write (program_id () + '\n')
 
 def print_version ():
-    sys.stdout.write (program_id ())
+    sys.stdout.write (program_id () + '\n')
 
 def help ():
     sys.stdout.write (
@@ -1046,7 +1050,8 @@ def main():
 	    return 0
 	    
     identify()
-	    
+    Props.read_titledefs ()
+    
     if len(files):
         for file in files:
             infile.open(file)