From 3daaff00a14ca87a77717dae08d8d077c818d214 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 5 Aug 2002 12:19:47 +0000
Subject: [PATCH] robustify.

---
 ChangeLog                              |  2 ++
 Documentation/user/lilypond-book.itely |  4 ++--
 Documentation/user/refman.itely        |  9 +++++----
 lily/include/lily-guile.hh             |  2 +-
 lily/main.cc                           |  2 +-
 lily/parser.yy                         |  2 --
 stepmake/bin/make-version.py           | 21 ++++++++++++++++++---
 7 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5ee523996..9c5ee4be91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* stepmake/bin/make-version.py: robustify.
+
 	* input/test/rhythm-excercise.ly: new file
 
 	* input/test/blank-notes.ly: new file
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index a26fc46284..b1a5d37eff 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -8,14 +8,14 @@ TODO: cleanup
 
    Could also do with a cleanup.  Lost inspiration to fix this manual
    where to describe what?
-   
-
 
 @end ignore
 
 @c @node Merging text and music with lilypond-book
 @c @chapter Merging text and music with lilypond-book
 
+@c  fix this node name , this is too long.
+
 @node Insert music snippets into your texts using lilypond-book
 @chapter Insert music snippets into your texts using lilypond-book
 
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 7d7aa7c09b..ef530ca8e4 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -4435,10 +4435,11 @@ that case @code{interscoreline} specifies the minimum spacing.
 
 If the variable @code{lastpagefill} is defined (that is, it gets any
 value assigned in the @code{\paper} block), systems are evenly
-distributed vertically on the last page.  This might produce ugly results
-in case there are not enough systems on the last page.  Note that
-@command{lilypond-book} ignores @code{lastpagefill}.  See
-@ref{Merging text and music with lilypond-book} for more information.
+distributed vertically on the last page.  This might produce ugly
+results in case there are not enough systems on the last page.  Note
+that @command{lilypond-book} ignores @code{lastpagefill}.  See
+@ref{Insert music snippets into your texts using lilypond-book} for
+more information.
 
 @cindex @code{lastpagefill}
 
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 30ccc4cfb1..18ee25577e 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -128,7 +128,7 @@ SCM ly_truncate_list (int k, SCM l );
  SCM value = cached;  /* We store this one locally, since G++ -O2 fucks up else */   \
  if ( __builtin_constant_p ((x)))\
  {  if (!cached)\
-     value = cached =  scm_gc_protect_object (my_gh_symbol2scm((x)));\
+     value = cached =  scm_gc_protect_object (gh_symbol2scm((x)));\
  } else\
   value = gh_symbol2scm ((char*) (x)); \
   value; })
diff --git a/lily/main.cc b/lily/main.cc
index 14fe9a452c..d0c12ef46e 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <locale.h>
-#include <stdio.h>
+#include <string.h>
 
 #include "config.h"
 
diff --git a/lily/parser.yy b/lily/parser.yy
index 5e4e1b6ebf..73e7d91721 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -25,8 +25,6 @@ this.
 
 #include <ctype.h>
 
-//#include <iostream>
-
 #include "translator-def.hh"
 #include "lily-guile.hh"
 #include "change-iterator.hh"
diff --git a/stepmake/bin/make-version.py b/stepmake/bin/make-version.py
index 9f4a3f46a3..3c7089db81 100644
--- a/stepmake/bin/make-version.py
+++ b/stepmake/bin/make-version.py
@@ -18,12 +18,27 @@ for l in ls:
 		defs.append ((m.group(1), m.group(2)))
 
 
-sys.stdout.write ('/* automatically generated */')
+sys.stdout.write (r'''
+#ifndef VERSION_HH
+#define VERSION_HH
+/* automatically generated */
+
+
+''')
 for d in defs:
-	sys.stdout.write ('#define %s \"%s\"\n' % d)
+
+	# GUILE leaks autoconf data into userspace. 
+	sys.stdout.write ('#ifdef %s\n' % d[0])
+	sys.stdout.write ('#undef %s\n' % d[0])
+	sys.stdout.write ('#endif /* %s */\n' % d[0])		
+	
+	sys.stdout.write ('#define %s "%s"\n' % d)
+	
 
 if ('MY_PATCH_LEVEL', '') in defs:
 	sys.stdout.write ('#define NO_MY_PATCHLEVEL')
 
-sys.stdout.write('\n');
+sys.stdout.write(r'''
+#endif
+''')
 	
-- 
2.39.5