From: hanwen <hanwen>
Date: Sat, 18 Sep 2004 09:51:28 +0000 (+0000)
Subject: (parse_argv): process --tex too.
X-Git-Tag: release/2.3.24^2~189
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6a1be76862938f841302f886c870a9eb08b57353;p=lilypond.git

(parse_argv): process --tex too.
---

diff --git a/ChangeLog b/ChangeLog
index 27e9139270..722c36776b 100644
--- 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 d60fdb76a6..180f216340 100644
--- 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 bed719e02b..12c6598ac8 100644
--- 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 5ee2eece9d..74a018010b 100644
--- 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))