patch::: 1.3.107.mb1: Re: lily 1.3.107

diff --git a/VERSION b/VERSION
index 6ecffd3ce9b7ac7e571a43d3d9df3c87e812fbae..d37b31e48cf97cfeace473982b0a7e9a45794689 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=107
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly
index 0668bd2b506bbda05d4a138ca4d0a7bd7d05ffc1..b2d32460c927c28ce4134fa11b21e8fb749f4b44 100644 (file)
--- a/input/test/orchestscore.ly
+++ b/input/test/orchestscore.ly
@@ -1,4 +1,4 @@
-\version "1.3.96";
+\version "1.3.102";
 
 m = \notes \relative c''{
 
@@ -94,11 +94,9 @@ c1 | c2 c | c c | R1*5
     textheight = 260.\mm;
     \translator {
        \OrchestralScoreContext
-       barNumberScriptPadding = 10;
+%      barNumberScriptPadding = 10;
     }
     \translator { \HaraKiriStaffContext
-        marginScriptPadding = 15.0;
-%        StaffMinimumVerticalExtent = #(cons -0.0 0.0)
     }
   }
 }

diff --git a/lily/duration.cc b/lily/duration.cc
index 163b849d2af8fe43d1da25bf05cf681cc7f21cf5..6b9925ba178a8b748e6f32c63dd53ad6cebae64a 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -97,7 +97,7 @@ Duration::print_smob (SCM s, SCM port, scm_print_state *)
   Duration  *r = (Duration *) gh_cdr (s);
      
   scm_puts ("#<Duration ", port);
-  scm_display (gh_str02scm (r->str().ch_C()), port);
+  scm_display (gh_str02scm ((char*)r->str().ch_C()), port);
   scm_puts (" >", port);
   
   return 1;

diff --git a/lily/music-iterator-ctor.cc b/lily/music-iterator-ctor.cc
index c599c57817583f0c2dcf9006e5dca80f30f68832..28572ddd31992321a2fe40327c1738474b8d219a 100644 (file)
--- a/lily/music-iterator-ctor.cc
+++ b/lily/music-iterator-ctor.cc
@@ -8,6 +8,7 @@
  */
 
 #include "music-iterator-ctor.hh"
+#include "ly-smobs.icc"
 
 static long callback_tag;
 

diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc
index 9a798b59e9cef1ba00d0be6bc29122c9c5daa43b..fad725bb23e4f1e1d71edbbb33d08e14f13900a1 100644 (file)
--- a/lily/musical-pitch.cc
+++ b/lily/musical-pitch.cc
@@ -212,7 +212,7 @@ Musical_pitch::print_smob (SCM s, SCM port, scm_print_state *)
   Musical_pitch  *r = (Musical_pitch *) gh_cdr (s);
      
   scm_puts ("#<Musical_pitch ", port);
-  scm_display (gh_str02scm (r->str().ch_C()), port);
+  scm_display (gh_str02scm ((char*)r->str().ch_C()), port);
   scm_puts (" >", port);
   
   return 1;

diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm
index 72c8e72edddffacac16adb2e3af1344f4b4988d0..0b0e552b2ff704425c19bac847b6b19e67e2c401 100644 (file)
--- a/scm/element-descriptions.scm
+++ b/scm/element-descriptions.scm
@@ -246,7 +246,7 @@
                (molecule-callback . ,Text_item::brew_molecule)
                (direction . 1)
                (breakable . #t)
-               (font-family . number)
+               (font-family . roman)
                (font-relative-size . 1)
                (visibility-lambda . ,end-of-line-invisible)
                (padding . 0.8)