From c1388dbcefec7392b2b310645b7fb0d79bdb4322 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 01:21:12 +0000
Subject: [PATCH] lilypond-1.5.8

---
 Documentation/topdocs/AUTHORS.texi |  2 ++
 lilypond-mode.el                   | 21 +++++++++++++++++++++
 scm/tex.scm                        |  2 +-
 scripts/GNUmakefile                |  2 +-
 tex/lilyponddefs.tex               |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index 269c1aeb01..bd444931a4 100644
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -35,6 +35,8 @@ list is alphabetically ordered.
     German glossary stuff.
 @item @email{nj104@@cus.cam.ac.uk, Neil Jerram}. 
     parts of Documentation/Vocab*
+@item @email{heikki.junes@@hut.fi, Heikki Junes}. 
+    Finnish note names
 @item Donald Ervin Knuth,  @uref{http://www-cs-staff.stanford.edu/~knuth/}
     mf/ital-*.mf (these were taken from the CM fonts)
 @item @email{m.krause@@tu-harburg.de, Michael Krause},
diff --git a/lilypond-mode.el b/lilypond-mode.el
index 8ea8cf8b7d..e0b7de1c76 100644
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -4,6 +4,9 @@
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
 ;;; (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; 
+;;; Changed 29th Aug 2001 Heikki Junes <heikki.junes@hut.fi>
+;;;    * Add PS-compilation, PS-viewing and MIDI-play
 
 ;;; Inspired on auctex
 
@@ -132,6 +135,18 @@ in LilyPond-include-path."
   :group 'LilyPond
   :type 'string)
 
+(defcustom LilyPond-gv-command "gv -watch"
+  "Command used to display PS files."
+
+  :group 'LilyPond
+  :type 'string)
+
+(defcustom LilyPond-midi-command "timidity"
+  "Command used to play MIDI files."
+
+  :group 'LilyPond
+  :type 'string)
+
 ;; This is the major configuration variable.
 (defcustom LilyPond-command-alist
   `(
@@ -139,6 +154,7 @@ in LilyPond-include-path."
     ("TeX" . ("tex '\\nonstopmode\\input %t'" . "View"))
 
     ("2Dvi" . ("ly2dvi %s" . "View"))
+    ("2PS" . ("ly2dvi -P %s" . "View"))
 
     ("Book" . ("lilypond-book %x" . "LaTeX"))
     ("LaTeX" . ("latex '\\nonstopmode\\input %l'" . "View"))
@@ -148,6 +164,10 @@ in LilyPond-include-path."
     
     ;; refreshes when kicked USR1
     ("View" . (,(concat LilyPond-xdvi-command " %d") . "LilyPond"))
+
+    ("ViewPS" . (,(concat LilyPond-gv-command " %p") . "LilyPond"))
+
+    ("Midi" . (,(concat LilyPond-midi-command " %m") . "LilyPond"))
     )
 
   "AList of commands to execute on the current document.
@@ -180,6 +200,7 @@ LilyPond-expand-list.
     ("%p" . ".ps")
     ("%l" . ".latex")
     ("%x" . ".tely")
+    ("%m" . ".midi")
     )
     
   "Alist of expansion strings for LilyPond command names."
diff --git a/scm/tex.scm b/scm/tex.scm
index fa3411bed5..1a1ec47cf6 100644
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -106,7 +106,7 @@
 	 (ly-gulp-file "music-drawing-routines.ps"))
      (if (defined? 'ps-testing) "/testing true def%\n" "")
      "}"
-     "\\input lilyponddefs\\newdimen\\outputscale \\outputscale=\\lilypondpaperoutputscale pt\\turnOnPostScript"))
+     "\\input lilyponddefs \\outputscale=\\lilypondpaperoutputscale pt\\turnOnPostScript"))
 
   ;; Note: this string must match the string in ly2dvi.py!!!
   (define (header creator generate) 
diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index 318e463cc7..eb0687f223 100644
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,12 +1,12 @@
 # bin/Makefile
 
 depth = ..
+
 SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly
 STEPMAKE_TEMPLATES=script help2man po
 HELP2MAN_EXECS = $(SEXECUTABLES)
 
 include $(depth)/make/stepmake.make 
-
 include $(stepdir)/executable-targets.make
 
 
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 78efb4bc8b..0b00c76eb1 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -78,5 +78,5 @@
         \csname%
         nolilyfooter\texsuffix\endcsname
 \fi
-
+\newdimen\outputscale
 \endinput
-- 
2.39.5