patch::: 1.3.117.jcn3

diff --git a/VERSION b/VERSION
index a2f11a7e8d9ba0e9907e666ca1dd60659e01d37a..9eee9a0ec2947f00c4f07e9a030e6fd209ad8647 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=117
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/warnings.ly b/input/test/warnings.ly
new file mode 100644 (file)
index 0000000..655d27c
--- /dev/null
+++ b/input/test/warnings.ly
@@ -0,0 +1,15 @@
+\header {
+texidoc="Various warnings
+";
+}
+
+linebreak = \penalty -1000;
+
+\score {
+  \notes {
+    \property Voice.Stem \set #'length = #"foo"
+    \property Voice.Stem \set #'longth = #2
+    \property Staff.clefStyle = #"foo"
+    \property Staff.clefStyle = #2
+ }
+}

diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index 79227b559077953d5fb6a117fa52297612f23eeb..5b6091907f3b3eeccff3424d5740a181fffca75a 100644 (file)
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -148,7 +148,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
            SCM type_name = gh_call1 (typefunc, type_p);
            warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s",
                         ly_symbol2string (prop_sym).ch_C (),
-                        ly_symbol2string (type_name).ch_C (),
+                        ly_scm2string (type_name).ch_C (),
                         ly_scm2string (ly_write2scm (val)).ch_C (),
                         ly_scm2string (ly_type (val)).ch_C ()));
            scm_puts ("\n", errport);

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 82a25ae4b7582fb68c4b1308195b975621f71adf..08b5033451e2a43a639bd2e4332cd2908d2d138f 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -419,9 +419,8 @@ type_check_assignment (SCM val, SCM sym,  SCM type_symbol)
          /* warning () ? */
          scm_puts (_f ("Failed typecheck for `%s', value `%s' must be of type `%s'",
                        ly_symbol2string (sym).ch_C (),
-                       ly_symbol2string (val).ch_C (),
-                       ly_scm2string (ly_write2scm (val)).ch_C (),
-                       ly_symbol2string (type_name).ch_C ()).ch_C (),
+                       ly_scm2string (ly_write2scm( val)).ch_C (),
+                       ly_scm2string (type_name).ch_C ()).ch_C (),
                    errport);
          scm_puts ("\n", errport);                   
        }