(make_ps_images): Escape newline.

diff --git a/ChangeLog b/ChangeLog
index f587b3492bf72492e42f4e9588e13a26b6448267..5f7c57979e8999ae3d2b036257d5e0ad3c66b0b1 100644 (file)
--- 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 fc3002589e0529c35a4ad4e3055d6984827544e8..55eb9704bf90d1673e02d5490e159a421cc6ddf4 100644 (file)
--- 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 61cf45a73190088bcbe2389cd5624f3531f41797..3623abc0c63ed9cf6a7aa5500229b5137ea48492 100644 (file)
--- 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 3e5848b81e98d7204a724ffa4cc55e13e7138fdf..ffeda544253ddd6c88a9ee9b4bd22f6ac81e5362 100644 (file)
--- 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 bdad9633e612c3b865b9e758d40b208cd90e7a44..4221f8ed45363e2c3191bcc7ee69e56ab2ba99a3 100644 (file)
--- 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