From: Han-Wen Nienhuys Date: Sat, 24 Jul 2004 21:36:34 +0000 (+0000) Subject: * scm/page-layout.scm (plain-header): add printpagenumber boolean X-Git-Tag: release/2.3.10~57 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a5a58a6f270a0ee2f488305b8c1f222174fa742;p=lilypond.git * 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 652f7c07a6..5df19b848a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-07-24 Han-Wen Nienhuys + * 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 b6983db4b0..38813a3e32 100644 --- 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 710090e4b8..9d1b0008a0 100644 --- 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 5e56c23773..cfadf57398 100644 --- 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 7fda2b047b..9a3a4156e1 100644 --- 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 2a213f9591..6506eb0e2a 100644 --- 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 695ebb201c..691f86a577 100644 --- 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 7e44505f50..25065e4aeb 100644 --- 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 a86e9c7e42..b914429ea0 100644 --- 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 1a00c37bdc..3f9a9baa2c 100644 --- 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)