From 0ed35996971e31e6c235d502d8dd1fa194fae9a1 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 17 Sep 2004 21:10:46 +0000
Subject: [PATCH] *** empty log message ***

---
 input/simple-song.ly    | 6 +++---
 lily/main.cc            | 2 +-
 scm/music-functions.scm | 5 +++--
 scm/output-gnome.scm    | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/input/simple-song.ly b/input/simple-song.ly
index 68c637574a..57de8e3a54 100644
--- a/input/simple-song.ly
+++ b/input/simple-song.ly
@@ -1,3 +1,6 @@
+%% Optional helper for quick click and edit mode.  May be omitted
+#(ly:set-point-and-click 'line-column)
+
 %% A simple song in LilyPond
 <<
     \relative {
@@ -14,6 +17,3 @@
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
 \version "2.3.16"
     
-%% Optional helper for quick click and edit mode.  May be omitted
-#(ly:set-point-and-click 'line-column)
-
diff --git a/lily/main.cc b/lily/main.cc
index ddc5dea2f1..bed719e02b 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -47,7 +47,7 @@ bool no_paper_global_b = false;
 
 /* Selected output format.
    One of tex, ps, scm, as. */
-String output_format_global = "ps";
+String output_format_global = "tex";
 
 /* Current output name. */
 String output_name_global;
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 96f53bb285..aa3ecb9fb0 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -737,8 +737,9 @@ use GrandStaff as a context. "
       ;; Accidentals are cancelled across the staves in the same grand staff as well
       ((equal? style 'piano)
        (set-accidentals-properties #f
-				   '( Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)
-					    GrandStaff (any-octave . 0) (same-octave . 1))
+				   '(Staff (same-octave . 0)
+					   (any-octave . 0) (same-octave . 1)
+					   GrandStaff (any-octave . 0) (same-octave . 1))
 				   '()
 				   pcontext))
       ((equal? style 'piano-cautionary)
diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 2b6b43881c..904daeb814 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -60,7 +60,7 @@ export XEDITOR='/usr/bin/emacsclient --no-wait +%l:%c %f'
 ;;;
 ;;;  * Run lily:
 "
-lilypond-bin -fgnome input/simple-song.ly
+lilypond -fgnome input/simple-song.ly
 "
 ;;; point-and-click: (mouse-1) click on a graphical object;
 ;;; grob-property-list: (mouse-3) click on a graphical object.
-- 
2.39.5