* make/lilypond-vars.make: centralize LILYPOND_BOOK_FLAGS setting.

(LILYPOND_BOOK_FLAGS): use -f tex for lilypond-book.

* scm/framework-ps.scm (convert-to-pdf): new function. Call
ps2pdf.
(output-preview-framework): new function. Generate a preview .ps

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 4aef5cf1f6ac3f0d0f3836900a64b96bb42c6bf5..710090e4b8f2110152c57773a75c005743f7073b 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -6,30 +6,26 @@ This chapter details the technicalities of running LilyPond.
 
  
 @menu
-* Invoking lilypond::           Titling LilyPond scores.
-* Invoking the lilypond binary::  
+* Invoking lilypond::           
 * Error messages::              
 * Reporting bugs::              
 * Editor support::              
 * Point and click::             
+* Invoking lilypond-latex::     
 @end menu
-@node Invoking the lilypond binary
-@section Invoking the lilypond binary
+
+@node Invoking lilypond
+@section Invoking lilypond
 @cindex Invoking LilyPond
 @cindex command line options
 @cindex options, command line
 @cindex switches
 
 
-The formatting system consists of two parts: a binary executable
-(@file{lilypond}), which is responsible for the formatting
-functionality, and support scripts, which post-process the resulting
-output. Normally, the support scripts are called, which in turn invoke
-the @code{lilypond-bin} binary. However, @code{lilypond-bin} may be
-called directly as follows.
+The @code{lilypond} may be called as follows from the command line.
 
 @example
-        lilypond-bin [@var{option}]@dots{} @var{file}@dots{}
+        lilypond [@var{option}]@dots{} @var{file}@dots{}
 @end example
 
 
@@ -472,16 +468,21 @@ users can set @var{XEDITOR} to @code{gvim --remote +:%l:norm%c| %f}.
 @node Invoking lilypond-latex
 @section Invoking lilypond-latex
 
-Before LilyPond 3.0, the task of generating nicely titled output was
-relegated to a separate program. This wrapper script
-@code{lilypond-latex} uses the LilyPond program and La@TeX{} to create
-a nicely titled piece of sheet music.
+Before LilyPond 3.0, the @code{lilypond} program only generated music
+notation.  Titles and page layout was done in a separate wrapper
+program. For compatibility with older files, this wrapper program has
+been retained as @code{lilypond-latex}. It uses the LilyPond program
+and La@TeX{} to create a nicely titled piece of sheet music.  Use of
+this program is only necessary if the input file contains special
+La@TeX{} options or formatting codes in markup texts.
 
+The @code{lilypond-latex} wrapper is invoked from the command-line as
+follows
 @example
-        @code{lilypond} [@var{option}]@dots{} @var{file}@dots{}
+        @code{lilypond-latex} [@var{option}]@dots{} @var{file}@dots{}
 @end example
 
-To have @code{lilypond} read from stdin, use a dash @code{-} for
+To have @code{lilypond-latex} read from stdin, use a dash @code{-} for
 @var{file}.  The program supports the following options.
 
 @cindex stdin, reading

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 644297fb1a4f24cb429ef4dc76f1dcf0c00bb4c2..81c26f4693d26387147945e37c5a65a1f29f6555 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -379,7 +379,7 @@ Place generated files in @var{dir}.
 
 @item @option{-P @var{process}}, @option{--process=@var{COMMAND}}
 Process lilypond snippets using @var{command}.  The default command is
-@var{lilypond-bin}.
+@code{lilypond}.
 
 @item @option{--verbose}
 Be verbose.

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 0aa1189ec13049abb761769d5e5d20d78ed87be1..e63d5f5f3f3c926e6bb9375862d0e07d4564c6d2 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -286,7 +286,7 @@ You will see something resembling
 
 @example
 lilypond (GNU LilyPond) 2.2.0
-Running lilypond-bin...
+Running lilypond...
 Now processing `/home/fred/ly/test.ly'
 Parsing...
 Interpreting music...[1]

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index b571b4c16042aad61decb877100261871a0bf990..e78d33c23b458aa9e0278dbcfe508fcb531f5ed2 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -42,5 +42,5 @@ LILYPOND_BOOK_FLAGS = --process="lilypond-bin -f tex --header=texidoc -I $(srcdi
 
 #texi-html for www only:
 LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
-LY2DVI = $(script-dir)/lilypond.py
+LY2DVI = $(LILYPOND)
 LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 8c51c6f19778ba47c616e52d3aba7a0c5f8fb407..a86e9c7e4229e9c98a266bc37a992059c20b5283 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,11 +1,5 @@
 
 
-$(outdir)/%.png: $(outdir)/%.ps
-       gs -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$(name-stem)-page%d.png" -r90 -dNOPAUSE $< -c quit
-       -mv $(name-stem)-page*.png $(outdir)/
-       rm -f $@
-       ln -s $(name-stem)-page1.png $@
-
 $(outdir)/%.ly.txt: %.ly
        ln -f $< $@
 
@@ -19,13 +13,11 @@ $(outdir)/%.ly.txt: %.abc
 $(outdir)/%.ly: %.abc
        $(PYTHON) $(ABC2LY) --strict -o $@ $< 
 
-$(outdir)/%.ps: $(outdir)/%.ly
-       $(PYTHON) $(LY2DVI) --output=$@ $<  
-
-$(outdir)/%.ps: %.ly
-       $(PYTHON) $(LY2DVI) --output=$@ $<  
+$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
+# hmm. notdir builds srcdir builds? 
+       cd $(outdir); $(LILYPOND) --pdf --ps --png $(notdir $<)
 
-$(outdir)/%.pdf: $(outdir)/%.ps
-       ps2pdf -sPAPERSIZE=a4 $< $@
+$(outdir)/%.ly: %.ly
+       cp $< $@ 
 
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 1fd59496918005682970d19ea34746b5d39ee26f..0dd4ba0c447306c45f6a99ae9503d027d759893c 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -258,7 +258,7 @@
 (define-public (convert-to-pdf book name)
   (let*
       ((defs (ly:paper-book-book-paper book))
-       (size (ly:output-def-lookup book 'papersize)))
+       (size (ly:output-def-lookup defs 'papersize)))
 
     (postscript->pdf (if (string? size) size "a4")
                     name)))