* scm/page-layout.scm (plain-header): add printpagenumber boolean

to bookpaper.

* make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
$(outdir)/%.ly $(outdir)/%.ps): do all targets from lilypond binary.

* lily/paper-book.cc (output): call output-preview-framework
(post_processing): new function. Do PDF/PNG conversion.

diff --git a/ChangeLog b/ChangeLog
index 652f7c07a6b21b6c802cbbf773993193487376ab..5df19b848a627cbdbbddeb0385aa66801e51907e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-07-24  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/page-layout.scm (plain-header): add printpagenumber boolean
+       to bookpaper.
+
+       * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
+       $(outdir)/%.ly $(outdir)/%.ps): do all targets from lilypond binary.
+
        * scripts/lilypond-latex.py (run_dvips): remove -bin everywhere.
 
        * lily/GNUmakefile (NAME): create lilypond, not lilypond-bin 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index b6983db4b01e07d0c83d0d9778ea053d69733770..38813a3e320cc0e24fa1b8c6c852af2bfcc7dc4b 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -2218,6 +2218,9 @@ The default layout responds to the following settings in the
 The default page header puts the page number and the @code{instrument}
 field from the @code{\header} block on a line.
 
+
+
+
 @cindex copyright
 @cindex tagline
 
@@ -2230,6 +2233,15 @@ The header and footer are created by the functions @code{make-footer}
 and @code{make-header}, defined in @code{\bookpaper}. The default
 implementations are in @file{scm/page-layout.scm}.
 
+The following settings influence the header and footer layout.
+
+@table @code
+@item printpagenumber
+  this boolean controls whether a pagenumber is printed. 
+@end table
+
+
+
 The page layout itself is done by two functions:
 @code{page-music-height} and @code{page-make-stencil}. The former
 tells the line-breaking algorithm how much space can be spent on a

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 710090e4b8f2110152c57773a75c005743f7073b..9d1b0008a028b9a2bfd8214f40a923c95d2acb97 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -90,7 +90,8 @@ Set init file to @var{file} (default: @file{init.ly}).
 @item --pdf
     Generate PDF. This implies @code{--ps}.
 @item --preview
-    Also generate a picture of the first system of the score.
+    Generate an output file containing the titles and the first system
+of the score.
 
 @item -s,--safe
 Do not trust the @code{.ly} input. 

diff --git a/VERSION b/VERSION
index 5e56c23773843af13a318f4c0b0625a16a4f3c35..cfadf5739854fc3a7944613a81722a5c6d1977d2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3
-PATCH_LEVEL=8
+PATCH_LEVEL=9
 MY_PATCH_LEVEL=
 

diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index 7fda2b047b2927c389f8d23784b4a584ffc274bd..9a3a4156e117973d67675992f3b7ff30ac683036 100644 (file)
--- a/lily/ledger-line-engraver.cc
+++ b/lily/ledger-line-engraver.cc
@@ -56,7 +56,7 @@ Ledger_line_engraver::acknowledge_grob (Grob_info s)
                                     s.grob_);
 }
 ENTER_DESCRIPTION (Ledger_line_engraver,
-                  "Creates spanner to draw ledger lines",
+                  "Creates the spanner to draw ledger lines, and notices objects that need ledger lines",
                   /* creats*/       "LedgerLineSpanner",
                   /* accepts */     "",
                   /* acks  */      "custos-interface note-head-interface", // ledgered-interface? 

diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc
index 2a213f9591371af4fef45ab48b73aed1b2a9c290..6506eb0e2aeb1f1a5d90426278050bb0f05d0f6c 100644 (file)
--- a/lily/ledger-line-spanner.cc
+++ b/lily/ledger-line-spanner.cc
@@ -248,5 +248,5 @@ Ledger_line_spanner::print (SCM smob)
 
 ADD_INTERFACE (Ledger_line_spanner,
               "ledger-line-interface",
-              "This spanner draws the ledger lines of a staff on note heads. ",
+              "This spanner draws the ledger lines of a staff, for note heads that stick out. ",
               "note-heads thickness gap length minimum-length")

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 695ebb201c54a9ed893fd831910a79b5af65d874..691f86a577c96bd06363122f7fc826fd24e120f1 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -104,7 +104,7 @@ Staff_symbol::line_count (Grob*me)
 Real
 Staff_symbol::staff_space (Grob*me)
 {
-  return robust_scm2double ( me->get_property ("staff-space"), 1.0);
+  return robust_scm2double (me->get_property ("staff-space"), 1.0);
 }
 
 Real

diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly
index 7e44505f500b7614ea8a3ad5b99fb3676f6d81a4..25065e4aeb7764d6bc344b2ec7702d276fb20426 100644 (file)
--- a/ly/book-paper-defaults.ly
+++ b/ly/book-paper-defaults.ly
@@ -8,7 +8,7 @@
     cm = #(* 10 mm)
 
     inputencoding = #"TeX"
-    
+    printpagenumber = ##t
    %
    % 20pt staff, 5 pt = 1.75 mm
    %

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index a86e9c7e4229e9c98a266bc37a992059c20b5283..b914429ea0c4cfd30f2c5f83d832e8bcfe5a686e 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -13,9 +13,10 @@ $(outdir)/%.ly.txt: %.abc
 $(outdir)/%.ly: %.abc
        $(PYTHON) $(ABC2LY) --strict -o $@ $< 
 
-$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
 # hmm. notdir builds srcdir builds? 
-       cd $(outdir); $(LILYPOND) --pdf --ps --png $(notdir $<)
+$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
+       cd $(outdir); $(LILYPOND) --pdf --ps --png -I $(shell pwd)/ $(notdir $<)
+       touch $(outdir)/$(basename $(notdir $<)).png
 
 $(outdir)/%.ly: %.ly
        cp $< $@ 

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 1a00c37bdc92dc301b86f3e8d2eb91d2b1961866..3f9a9baa2ccc4922d7a2aa4edded8a9d38a0e378 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -36,9 +36,14 @@
 (define-public (plain-header paper scopes page-number last?)
   "Standard header for a part: page number --outside--  and instrument--centered."
 
-  (let* ((props (page-properties paper) )
-        (pnum (markup #:bold (number->string page-number)))
+  (let* ((props (page-properties paper))
+        (pnum
+         (if (ly:output-def-lookup paper 'printpagenumber)
+             (markup #:bold (number->string page-number))
+             ""
+             ))
         (instr (ly:modules-lookup scopes 'instrument))
+        
         (line (list "" (if (markup? instr) instr "") pnum)))
 
     (if (even? page-number)