From fdb028cbf6ea4dc15474dc399f88e37fb42ed4ff Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 24 Oct 2004 15:19:59 +0000
Subject: [PATCH] * THANKS: add Meisters to the Development team.

* scm/framework-tex.scm (convert-to-dvi): redirect output to
/dev/null for non-verbose.

* Documentation/user/invoking.itely (Invoking lilypond): add note
about resource usage.

* Documentation/user/lilypond.tely: add -*- coding: latin-1 -*- everywhere.

* Documentation/user/lilypond.tely: add language and encoding.
---
 ChangeLog                         |  8 +++++++
 Documentation/user/invoking.itely |  6 +++---
 Documentation/user/lilypond.tely  |  2 +-
 THANKS                            |  8 +++----
 scm/documentation-lib.scm         |  2 +-
 scm/framework-tex.scm             | 35 ++++++++++++++++++++++++-------
 scripts/lilypond-book.py          | 11 ++++++++--
 7 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce15cec154..cefebfd7f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-10-24  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* THANKS: add Meisters to the Development team.
+
+	* scm/framework-tex.scm (convert-to-dvi): redirect output to
+	/dev/null for non-verbose.
+
+	* Documentation/user/invoking.itely (Invoking lilypond): add note
+	about resource usage.
+
 	* tex/GNUmakefile (TEX_FILES): add texinfo.cnf
 
 	* stepmake/stepmake/texinfo-vars.make (MAKEINFO): add
diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely
index c05ad87c28..d0005ebde0 100644
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -119,9 +119,9 @@ into Scheme.
 
 @code{--safe} does @emph{not} detect resource overuse. It is still
 possible to make the program hang indefinitely, for example by feeding
-cyclic data structures into the backend.  If using LilyPond
-on a publically accessible webserver, the process should limited in both
-allowed  CPU and memory usage.
+cyclic data structures into the backend.  Therefore, if using LilyPond
+on a publicly accessible webserver, the process should limited in
+both allowed CPU and memory usage.
 
 @item -v,--version
 Show version information.
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index d9e2bb6803..c0809fa045 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -1,4 +1,4 @@
-\input texinfo @c -*- coding: latin-1; mode: texinfo; -*-
+i\input texinfo @c -*- coding: latin-1; mode: texinfo; -*-
 @setfilename lilypond.info
 @settitle GNU LilyPond
 @iftex
diff --git a/THANKS b/THANKS
index 5402806268..4993d2af9a 100644
--- a/THANKS
+++ b/THANKS
@@ -2,25 +2,25 @@
 Release 2.3
 ***********
 
-HEAD HACKERS
+DEVELOPMENT TEAM
 
 Han-Wen Nienhuys
 Jan Nieuwenhuizen
+Erik Sandberg - Bug Meister
+Pedro Kroger - Build Meister
+Graham Parcival - Documentation Editor
 
 
 CONTRIBUTORS
 
 Carl Sorensen
 David Svoboda
-Erik Sandberg
-Graham Percival
 Guy Gascoigne-Piggford
 Heikki Junes
 Hendrik Maryns
 Kristof Bastiaensen
 Mats Bengtsson
 Michael Welsh Duggan
-Pedro Kroger
 Peter Lutek
 Werner Lemberg
 
diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index 4f7a0f0594..02d610462e 100644
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -143,7 +143,7 @@
    "\n@direntry"
    ;; prepend GNU for dir, must be unique
    "\n* GNU " name ": (" file-name ").          " name "."
-   "\n@end direntry"
+   "\n@end direntry\n"
    "@documentlanguage en\n"
    "@documentencoding ISO-8859-1\n"
 
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index c119578c52..6fc83dcfc4 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -283,9 +283,21 @@
 				 " -t landscape "
 				 " ")
 			     "  -u+ec-mftrace.map -u+lilypond.map -Ppdf "
-			     (basename name ".tex"))))
-    (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
-    (newline (current-error-port))
+			     (basename name ".tex")
+
+			     (if (ly:get-option 'verbose)
+				 " "
+				 " 2>&1 1>& /dev/null ")
+			     )))
+
+    (if (ly:get-option 'verbose)
+	(begin 
+	  (newline (current-error-port))
+
+	  (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
+	  (newline (current-error-port)))
+	(display "Converting to PS" (current-error-port))
+	)
     (system cmd)))
 
 (define-public (convert-to-dvi book name)
@@ -295,11 +307,20 @@
 	    #f " *%.*\n?"
 	    (ly:kpathsea-expand-variable "$extra_mem_top")
 	    'pre "" 'post)))
-	 (cmd (string-append "latex \\\\nonstopmode \\\\input " name)))
+	 (cmd (string-append
+	       "latex \\\\nonstopmode \\\\input " name
+	       (if (ly:get-option 'verbose)
+		   " "
+		   " 2>&1 1>& /dev/null ")
+
+	       )))
     (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
-    (newline (current-error-port))
-    (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
-    (newline (current-error-port))
+    (if (ly:get-option 'verbose)
+	(begin 
+	  (newline (current-error-port))
+	  (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
+	  (newline (current-error-port)))
+	(display "Converting to PDF" (current-error-port)))
 
     ;; fixme: set in environment?
     (if (ly:get-option 'safe)
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index afb35496a0..7c428ac266 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -464,9 +464,16 @@ PREAMBLE_LY = r"""%%%% Generated by %(program_name)s
 
 FRAGMENT_LY = r'''
     %(notes_string)s{
-	%(code)s    }
+%% ly snippet contents follows: 
+	%(code)s
+%% end ly snippet
+	}
+'''
+FULL_LY = '''
+%% ly snippet:
+%(code)s
+%% end ly snippet
 '''
-FULL_LY = '%(code)s'
 
 texinfo_linewidths = {
 	'@afourpaper': '160 \\mm',
-- 
2.39.5