* lily/scm-option.cc: move debug-beam to \paper.

* scripts/lilypond-book.py (Lilypond_snippet.write_ly): create
.txt files to appease makeinfobm.

* lily/new-slur.cc: cleanup, split in functions.

* lily/new-slur.cc (score_encompass): variable head-distance penalty.

* lily/new-slur.cc (print): use debug-slur-quanting paper var.

* input/regression/font-postscript.ly: invoke afm2tfm.

diff --git a/ChangeLog b/ChangeLog
index f9b6656f97ddcec6caf40233b8213ce0a7caf964..28254cb4b15b9a96ec29ec39d4808517f4ae8e0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-07-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/scm-option.cc: move debug-beam to \paper.
+
+       * scripts/lilypond-book.py (Lilypond_snippet.write_ly): create
+       .txt files to appease makeinfobm.
+
        * input/mutopia/W.A.Mozart/mozart-hrn-3.ly:
        remove texttagline.
        

diff --git a/VERSION b/VERSION
index bd695d9ba674a3307d92daac95f35e3b75998f18..6da315743fbe71533583183b9167f009f31d49f7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3
-PATCH_LEVEL=6
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=7
+MY_PATCH_LEVEL=
 

diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index 50131ff88329c32cf4ff75fbcbe2acdb1eda83c0..38d7ef0aa421e3ea11b38b5b9ac2fa7f2d2622d8 100644 (file)
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -12,7 +12,6 @@ texidoc = "Concave beams should be horizontal. Informally spoken,
 }
 
 
-#(ly:set-option 'debug-beam #t)
 resetMeasure = \set Score.measurePosition = #(ly:make-moment 0 1)
 
 % examples from 
@@ -71,8 +70,8 @@ nonHorizBeams = \relative c'' {
    }
   \paper{
     raggedright = ##t
+    #(define debug-beam-quanting #t)
   }
 }
 
-#(ly:set-option 'debug-beam #f)
 

diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly
index 3c627d3af6349643060e74082c751710b1bbdf34..a74c760403825767c993d8c52ca6a011de504e34 100644 (file)
--- a/input/regression/beam-quant-standard.ly
+++ b/input/regression/beam-quant-standard.ly
@@ -10,12 +10,14 @@
 % todo: make the check-quant function throw an error for incorrect quants
 %
 
-\paper  { raggedright = ##t }
+\paper  {
+    raggedright = ##t
+    #(define debug-beam-quanting #t)
+
+      }
 
 filler = \relative { e4 e }
 % 
-#(ly:set-option 'debug-beam #t)
-
 
 
 primes = \relative {
@@ -83,4 +85,3 @@ seconds = \relative {
 
 { \primes \seconds }
 
-#(ly:set-option 'debug-beam #f)

diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly
index 71110e782bdc716745e9fde23712ca376813a890..48f092bada0cf8766ba12bfaa2d085a9591597bd 100644 (file)
--- a/input/regression/font-postscript.ly
+++ b/input/regression/font-postscript.ly
@@ -2,7 +2,8 @@
 
     texidoc = "This file demonstrates how to load different
     (postscript) fonts. The file @file{font.scm} shows how to define
-    the scheme-function called."
+    the scheme-function @code{make-century-schoolbook-tree}."
+
 }
 
 \bookpaper

diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly
index 5c4a5820b989d106ce4276bac78412c6ed609fd1..abffc02d033448790d0eb71d13500f2c9960d049 100644 (file)
--- a/input/regression/new-slur.ly
+++ b/input/regression/new-slur.ly
@@ -7,8 +7,6 @@
     raggedright = ##t
 }
 
-% #(ly:set-option 'debug-beam #t)
-
 %% help lilypond-book
 %% \score
 
@@ -45,4 +43,3 @@
     c,,^( c')
     }
 
-% #(ly:set-option 'debug-beam #f)

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 4f963f7a3b379475f2ec65ef866dd0c7c942e1ec..6c9424d4cca69b2edd4a893e56f2c63c0b727444 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -40,8 +40,6 @@ const int IDEAL_SLOPE_FACTOR = 10;
 const Real ROUND_TO_ZERO_SLOPE = 0.02;
 const int ROUND_TO_ZERO_POINTS = 4;
 
-extern bool debug_beam_quanting_flag;
-
 static Real
 shrink_extra_weight (Real x, Real fac)
 {
@@ -281,7 +279,7 @@ Beam::quanting (SCM smob)
 
 #if DEBUG_QUANTING
   SCM inspect_quants = me->get_property ("inspect-quants");
-  if (debug_beam_quanting_flag
+  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
       && ly_c_pair_p (inspect_quants))
     {
       Drul_array<Real> ins = ly_scm2interval (inspect_quants);
@@ -307,13 +305,13 @@ Beam::quanting (SCM smob)
                    ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
                                                       qscores[best_idx].yr)));
 #if DEBUG_QUANTING
-  if (debug_beam_quanting_flag)
+  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))
     {
       qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
       
       // debug quanting
       me->set_property ("quant-score",
-                            scm_makfrom0str (qscores[best_idx].score_card_.to_str0 ()));
+                       scm_makfrom0str (qscores[best_idx].score_card_.to_str0 ()));
     }
 #endif
 

diff --git a/lily/beam.cc b/lily/beam.cc
index 29b692ff272bfd9b20344752f4ffa489cc04dae6..d884282e61537d4868c773c8b9751ab1abe58b03 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -43,8 +43,6 @@ Notes:
 #include "spanner.hh"
 #include "warn.hh"
 
-bool debug_beam_quanting_flag;
-
 
 #if DEBUG_QUANTING
 #include "text-item.hh"  // debug output.
@@ -510,7 +508,7 @@ Beam::print (SCM grob)
 
 #if (DEBUG_QUANTING)
   SCM quant_score = me->get_property ("quant-score");
-  if (debug_beam_quanting_flag
+  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
       && ly_c_string_p (quant_score))
     {
       

diff --git a/lily/scm-option.cc b/lily/scm-option.cc
index f89e27698aa588e2c8b44fa754c7cdc718c8c1a6..d16d3df326a1d47b70eb5d628f4cc08af6c687d0 100644 (file)
--- a/lily/scm-option.cc
+++ b/lily/scm-option.cc
@@ -124,10 +124,6 @@ LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
     }
   else if (var == ly_symbol2scm ("new-relative"))
     lily_1_8_relative = false;
-  else if (var == ly_symbol2scm ("debug-beam"))
-    {
-      debug_beam_quanting_flag = true;
-    }
   else
     {
       if (ly_c_symbol_p (var))

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 2160e929c34c0fe52b2d3a0e183a58b628fff682..ec6b43f8e17c96272ef75866865d0314e7930cb8 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,7 +6,7 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex cmr.enc.in
+EXTRA_DIST_FILES += README feta.tex 
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 42991681ad02a611121aa3fe0d7e8cadeeb6b6a1..90fd9e57b3ce73913ccfff0cd03abcbf00a6f45e 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -543,6 +543,9 @@ class Lilypond_snippet (Snippet):
        def write_ly (self):
                outf = open (self.basename () + '.ly', 'w')
                outf.write (self.full_ly ())
+               
+               open (self.basename() + '.txt', 'w').write("image of music")
+               
 
        def is_outdated (self):
                base = self.basename ()
@@ -613,6 +616,7 @@ class Lilypond_snippet (Snippet):
                str = output[TEXINFO][BEFORE] % vars ()
                for image in self.get_images ():
                        base, ext = os.path.splitext (image)
+                       
                        # URG, makeinfo implicitely prepends dot to ext
                        # specifying no extension is most robust
                        ext = ''
@@ -803,6 +807,7 @@ def process_snippets (cmd, snippets):
                        if not os.path.exists (i + '.eps') and os.path.exists (i + '.tex'):
                                to_eps (i)
                                ly.make_ps_images (i + '.eps', resolution=110)
+                               
 #                      elif os.path.exists (i + '.ps'):
 #                              ly.make_ps_images (i + '.ps', resolution=110)