lilypond-1.0.11

diff --git a/init/paper11.ly b/init/paper11.ly
index e5f5a613be6c15eea34cc78779f50487944d0e60..e20c03caa467ba3bff5dd3b8f24512246761c64b 100644 (file)
--- a/init/paper11.ly
+++ b/init/paper11.ly
@@ -12,7 +12,6 @@ paper_eleven = \paper {
        quartwidth = 3.63\pt;
        wholewidth = 5.45\pt;
 
-       basicspace = 3.\pt;
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 4.8\pt;
        

diff --git a/init/paper13.ly b/init/paper13.ly
index 104b3829faec618bceee1e98cbef64d15704074c..0d5c383d8944424b2cc1c99858afa942e4d961ee 100644 (file)
--- a/init/paper13.ly
+++ b/init/paper13.ly
@@ -12,7 +12,7 @@ paper_thirteen = \paper {
        quartwidth = 4.29\pt;
        wholewidth = 6.44\pt;
 
-       basicspace = 3.\pt;
+
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 4.8\pt;
        

diff --git a/init/paper16.ly b/init/paper16.ly
index c59a5c3ccfa7222a4cee46be84e6b9ed206efbb8..aa7095fa2bd9a1a5cce4c87b60efdc7639b2ef2f 100644 (file)
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -16,7 +16,7 @@ paper_sixteen = \paper {
        quartwidth = 5.28\pt;
        wholewidth = 7.92\pt;
 
-       basicspace = 4.\pt;
+
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 4.8\pt;
        texsetting = "\\input lilyponddefs \\musixsixteendefs ";

diff --git a/init/paper20.ly b/init/paper20.ly
index 955f164eecb20ce764e05bd00566fce0911ad30e..6f53e8b870130150d70d5a712ca9655795827f8f 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -16,7 +16,7 @@ paper_twenty = \paper {
        quartwidth =  6.61\pt
        wholewidth = 9.90\pt
 
-       basicspace = 8.\pt;
+
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 6.\pt;
        texsetting = "\\input lilyponddefs \\musixtwentydefs ";

diff --git a/init/paper26.ly b/init/paper26.ly
index 445506e575b51093c7fa60f6443c35d7be89296d..fcc19ae2dc878ecc1a1c403654c8992a26247240 100644 (file)
--- a/init/paper26.ly
+++ b/init/paper26.ly
@@ -10,7 +10,6 @@ paper_twentysix = \paper {
        notewidth = 8.59\pt
        wholewidth = 12.87\pt;
 
-       basicspace = 8.\pt;
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 6.\pt;
        

diff --git a/init/params.ly b/init/params.ly
index 677ebbfbc6cb1e83d45fd3a75ff8bcb30ecb397c..449c3c7aa5579c5feca858812aefb480cdc9a500 100644 (file)
--- a/init/params.ly
+++ b/init/params.ly
@@ -7,24 +7,28 @@ paperfile = \papersize + ".ly";
 \include "paper.ly";
 
 interline = \staffheight / 4.0;
-internote = \interline / 2.0;
+
+
+% thickness of stafflines
 staffline = \interline / 10.0;
 
 beam_thickness = 0.52 * (\interline - \staffline);
 interbeam = (2.0 * \interline - \beam_thickness) / 2.0;
 interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0;
-%
+
 
 % stems and beams
 %
 % not used for beams
-stem_length = 7.0*\internote;
+stem_length = 3.5*\interline;
+
 %
 % stems in unnatural (forced) direction should be shortened,
 % according to [Roush & Gourlay].  Their suggestion to knock off
 % a whole staffspace seems a bit drastical though?
 %
 forced_stem_shorten = 1.0 * \interline;
+
 %
 % there are several ways to calculate the direction of a beam
 % 
@@ -35,6 +39,7 @@ forced_stem_shorten = 1.0 * \interline;
 % enum Dir_algorithm { DOWN=-1, UP=1, MAJORITY=2, MEAN, MEDIAN };
 %
 beam_dir_algorithm = 2.0;
+
 %
 %
 % some beam-stemlength settings...
@@ -47,6 +52,7 @@ beam_minimum_stem1 = 1.5 * \interline;
 beam_minimum_stem2 = 1.0 * \interline;
 beam_ideal_stem1 = 2.0 * \interline;
 beam_ideal_stem2 = 1.5 * \interline;
+
 % beam_slope_damp_correct_factor = 2.0;
 beam_slope_damp_correct_factor = 0.0;
 
@@ -62,6 +68,7 @@ tie_slope_damping = 0.3;
 % slur_thickness = 1.8 * \staffline;
 slur_thickness = 1.4 * \staffline;
 slur_height_limit = \staffheight;
+
 % mmm, try bit flatter slurs
 % slur_ratio = 1.0 / 3.0;
 slur_ratio = 0.3;
@@ -78,9 +85,6 @@ barsize = \staffheight;
 rulethickness = \staffline;
 stemthickness = \staffline;
 
-% uhm
-unitspace = 22.\pt;
-geometric = 0.;
 
 gourlay_energybound = 100000.;
 %{

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index aafc2319289b20daf1a1a56ba4ace96b4e4ead21..3216e0cd1cccc3742ef3a4fefc20352ac4b586ba 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -99,8 +99,6 @@ Paper_def::linewidth_f () const
 Real
 Paper_def::duration_to_dist (Moment d,Real k) const
 {
-  if (get_var ("geometric"))
-    return geometric_spacing (d);
   return arithmetic_spacing (d,k);
 }
 
@@ -180,7 +178,7 @@ Paper_def::interbeam_f (int multiplicity_i) const
 Real
 Paper_def::internote_f () const
 {
-  return get_var ("internote");
+  return get_var ("interline") /2.0 ;
 }
 
 Real

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index b12167c7eedf66325f84426b618cc87dc3f719a9..81cd1795d3a58843d2377df2c090b58d567c33f1 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -14,7 +14,7 @@
 #  - rewrite in python
 
 program_name = 'convert-mudela'
-version = '0.2'
+version = '0.3'
 
 
 import os
@@ -272,6 +272,12 @@ def do_one_file (infile_name):
        
        do_conversion (infile, from_version, outfile, to_version)
 
+       if infile_name:
+               infile.close ()
+
+       if outfile_name:
+               outfile.close ()
+
        if __main__.edit:
                os.rename (infile_name, infile_name + '~')
                os.rename (infile_name + '.NEW', infile_name)