From 6f67a434a5f3153cd4b8271f6358dd414941d3f3 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 16 Apr 2005 08:07:57 +0000
Subject: [PATCH] (make_ps_images): Escape newline.

---
 ChangeLog                         |  2 ++
 lily/GNUmakefile                  |  2 ++
 lily/parser.yy                    | 15 ++++++++-------
 python/lilylib.py                 |  4 ++--
 stepmake/stepmake/po-targets.make |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f587b3492b..5f7c57979e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-04-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* python/lilylib.py (make_ps_images): Escape newline.
+
 	* Documentation/user/music-glossary.tely: Run
 	texinfo-all-menus-update.
 
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index fc3002589e..55eb9704bf 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -38,6 +38,8 @@ $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
 
+local-po: $(outdir)/parser.cc
+
 # ugh.  For --srcdir builds, these must exist to satisfy their broken
 # lexer.dep and parser.dep file entries.
 ifneq ($(srcdir), .)
diff --git a/lily/parser.yy b/lily/parser.yy
index 61cf45a731..3623abc0c6 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -10,16 +10,16 @@
 */
 
 /*
+FIXME:
 
-TODO:
-
-* The rules for who is protecting what are very shady. Uniformise
-  this.
-
-* There are too many lexical modes?
+   * The rules for who is protecting what are very shady.  Uniformise
+     this.
 
+   * There are too many lexical modes?
 */
 
+#include "config.hh"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -264,6 +264,7 @@ or
    bison.ly:1:5: error: syntax error, unexpected \\book", expecting '{'
    \book
 	\book %expect \book error here
+*/	
    
 /* Keyword tokens with plain escaped name.  */
 %token ACCEPTS "\\accepts"
@@ -272,7 +273,7 @@ or
 %token ALIAS "\\alias"
 %token ALTERNATIVE "\\alternative"
 %token BAR "\\bar"
-%token BOOK "\\book"
+%token BOOK "\book"
 %token CHANGE "\\change"
 %token CHORDMODE "\\chordmode"
 %token CHORDS "\\chords"
diff --git a/python/lilylib.py b/python/lilylib.py
index 3e5848b81e..ffeda54425 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -479,7 +479,7 @@ def make_ps_images (ps_name, resolution = 90, papersize = "a4",
 	
 	if not multi_page:
 		cmd = r'''gs\
-		-dEPSCrop
+		-dEPSCrop\
 		-dGraphicsAlphaBits=4\
 		-dNOPAUSE\
 		-dTextAlphaBits=4\
@@ -515,7 +515,7 @@ def make_ps_images (ps_name, resolution = 90, papersize = "a4",
 	if status:
 		remove = glob.glob (png1) + glob.glob (base + '-page*.png')
 		map (os.unlink, remove)
-		error (_ ("GS exited with status: %d" % status))
+		error (_ ("%s exited with status: %d" % ('GS', status))
 		exit (1)
 
 	if rename_page1_p or not multi_page:
diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make
index bdad9633e6..4221f8ed45 100644
--- a/stepmake/stepmake/po-targets.make
+++ b/stepmake/stepmake/po-targets.make
@@ -23,7 +23,7 @@ ifneq ($(strip $(ALL_PO_SOURCES)),)
 	@echo $(ALL_PO_SOURCES)
 	xgettext --default-domain=$(package) --join \
 	 --output-dir=$(po-dir)/$(outdir) --add-comments \
-	 --keyword=_ --keyword=_f --keyword=_i
+	 --keyword=_ --keyword=_f --keyword=_i \
 	 $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES)
 endif
 endif
-- 
2.39.2