(parse_argv): process --tex too.

diff --git a/ChangeLog b/ChangeLog
index 27e91392702d2b6d4428a6798e640cd6e79f4b81..722c36776be2c5b6e01dd8a97ad4d09277acf664 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2004-09-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/main.cc (parse_argv): process --tex too.
+
        * ly/music-functions-init.ly (keepWithTag): add music functions
-       keepWithTag and removeWithTag
+       keepWithTag and removeWithTag.
 
        * lily/quote-iterator.cc (Quote_iterator): init transposed_musics_.
 

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index d60fdb76a6353c225f436bdc883dafbf2d42e87c..180f216340aca405b99c65fe3a35d99b0c496b99 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -81,7 +81,8 @@ Auto_beam_engraver::process_music ()
       junk_beam ();
     }
 
-  if (forbid_)
+  if (forbid_
+      || !to_boolean (get_property ("autoBeaming")))
     {
       consider_end (shortest_mom_);
       junk_beam ();

diff --git a/lily/main.cc b/lily/main.cc
index bed719e02b0413af7b4d9873437cc300f36d0946..12c6598ac8074f71686ebe514e75a23ad1c21203 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -382,6 +382,8 @@ parse_argv (int argc, char **argv)
            make_ps = true;
          else if (String (opt->longname_str0_) == "dvi")
            make_dvi = true;
+         else if (String (opt->longname_str0_) == "tex")
+           make_tex = true;
          else if (String (opt->longname_str0_) == "preview")
            make_preview = true;
          break;

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5ee2eece9dd28d8db5097edcceb3d28cdfa459aa..74a018010b3e991d7e985fed142f06da608f5297 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -115,6 +115,7 @@
                        (custos . (minimum-space . 2.0))
                        (clef .   (minimum-space . 1.0))
                        (key-signature . (extra-space . 1.0))
+                       (key-cancellation . (extra-space . 1.0))
                        (first-note . (fixed-space . 1.3))
                        (next-note . (semi-fixed-space . 1.3))
                        (right-edge . (extra-space . 0.0))