+2004-03-11 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * lily/paper-book.cc: Do header and footer.
+
+2004-03-10 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * scm/lily.scm (safe-mode?): New name (was: security-paranoia).
+
+ * scm/paper.scm (lineheight): Remove
+ (head-sep, foot-sep): Add.
+
2004-03-10 Han-Wen Nienhuys <hanwen@xs4all.nl>
* lily/piano-pedal-engraver.cc (finalize): attach unfinished
spaceTest = \markup { "two space chars" }
\header {
texidoc = "Make titles using markup (WIP)."
+
+ tagline = "my tagline for v \version"
+ copyright = "copyright by me"
%dedication = "För my dør Lily"
% ugh: encoding char-size
\score {
\context Staff \notes \relative c' {
- \repeat unfold 10 { a b c d \break }
+ \repeat unfold 1 { a b c d \break }
c1
}
}
#include "paper-score.hh"
#include "stencil.hh"
+static SCM
+stencil2line (Stencil* stil)
+{
+ static SCM z = ly_offset2scm (Offset (0, 0));
+ Offset dim = Offset (stil->extent (X_AXIS).length (),
+ stil->extent (Y_AXIS).length ());
+ return scm_cons (ly_offset2scm (dim),
+ scm_list_1 (scm_cons (z, stil->smobbed_copy ())));
+}
+
+static SCM
+height2line (Real h)
+{
+ static SCM z = ly_offset2scm (Offset (0, 0));
+ return scm_cons (ly_offset2scm (Offset (0, h)),
+ scm_list_1 (scm_cons (z, SCM_EOL)));
+}
+
// WIP -- simplistic page interface
// Do we need this at all? SCM, smob?
class Page
{
public:
Paper_def *paper_;
+ int number_;
SCM lines_;
+ SCM protect_;
Stencil *header_;
Stencil *footer_;
//HMMM all this size stuff to paper/paper-outputter?
Real hsize_;
Real vsize_;
+ Real top_margin_;
+ Real bottom_margin_;
Real foot_sep_;
Real head_sep_;
/* available area for text. */
Real text_height ();
- Page (Paper_def*);
+ Page (Paper_def*, int);
void output (Paper_outputter*, bool);
};
-Page::Page (Paper_def *paper)
+Page::Page (Paper_def *paper, int number)
{
paper_ = paper;
+ number_ = number;
height_ = 0;
- header_ = 0;
- footer_ = 0;
lines_ = SCM_EOL;
hsize_ = paper->get_realvar (ly_symbol2scm ("hsize"));
vsize_ = paper->get_realvar (ly_symbol2scm ("vsize"));
- head_sep_ = 0; //paper->get_realvar (ly_symbol2scm ("head-sep"));
- foot_sep_ = 0; //paper->get_realvar (ly_symbol2scm ("foot-sep"));
+ top_margin_ = paper->get_realvar (ly_symbol2scm ("top-margin"));
+ bottom_margin_ = paper->get_realvar (ly_symbol2scm ("bottom-margin"));
+ head_sep_ = paper->get_realvar (ly_symbol2scm ("head-sep"));
+ foot_sep_ = paper->get_realvar (ly_symbol2scm ("foot-sep"));
+
+ SCM make_header = scm_primitive_eval (ly_symbol2scm ("make-header"));
+ SCM make_footer = scm_primitive_eval (ly_symbol2scm ("make-footer"));
+
+ header_ = unsmob_stencil (scm_call_2 (make_header, paper_->smobbed_copy (),
+ scm_int2num (number_)));
+ protect_ = SCM_EOL;
+ // ugh, how to protect a Stencil from the outside?
+ protect_ = scm_cons (header_->get_expr (), protect_);
+ if (header_)
+ header_->align_to (Y_AXIS, UP);
+
+ // FIXME: tagline/copyright
+ footer_ = unsmob_stencil (scm_call_2 (make_footer, paper_->smobbed_copy (),
+ scm_int2num (number_)));
+ // ugh, how to protect a Stencil from the outside?
+ protect_ = scm_cons (footer_->get_expr (), protect_);
+ if (footer_)
+ footer_->align_to (Y_AXIS, UP);
}
void
Page::output (Paper_outputter *out, bool is_last)
{
- // TODO: header/footer etc
+ if (header_)
+ {
+ out->output_line (stencil2line (header_), false);
+ out->output_line (height2line (head_sep_), false);
+ }
out->output_scheme (scm_list_1 (ly_symbol2scm ("start-page")));
for (SCM s = lines_; gh_pair_p (s); s = ly_cdr (s))
out->output_line (ly_car (s), is_last && gh_pair_p (ly_cdr (s)));
out->output_scheme (scm_list_2 (ly_symbol2scm ("stop-page"),
- gh_bool2scm (is_last)));
+ gh_bool2scm (is_last && !footer_)));
+ if (footer_)
+ {
+ out->output_line (height2line (foot_sep_), false);
+ out->output_line (stencil2line (footer_), is_last);
+ }
}
Real
Page::text_height ()
{
- Real h = vsize_;
+ Real h = vsize_ - top_margin_ - bottom_margin_;
if (header_)
h -= header_->extent (Y_AXIS).length () + head_sep_;
if (footer_)
}
/* TODO:
- - decent page breaking algorithm; fill-up page
- - header / footer (generate per Page, with page#, tagline/copyright)
+ - decent page breaking algorithm
+ - top/bottom & inter-line filling
+ - footer: tagline/copyright
- override: # pages, or pageBreakLines= #'(3 3 4), ? */
Link_array<Page>*
Paper_book::get_pages ()
}
Paper_def *paper = papers_[0];
- Page *page = new Page (paper);
+ int page_number = 1;
+ Page *page = new Page (paper, page_number++);
fprintf (stderr, "book_height: %f\n", book_height);
fprintf (stderr, "vsize: %f\n", page->vsize_);
fprintf (stderr, "pages: %f\n", book_height / page->text_height ());
if (page->height_ + h > text_height)
{
pages->push (page);
- page = new Page (paper);
+ page = new Page (paper, page_number++);
}
if (page->height_ + h <= text_height || page->height_ == 0)
{
if (j == 0 && title)
- {
- Offset dim = Offset (title->extent (X_AXIS).length (),
- title->extent (Y_AXIS).length ());
- page->lines_
- = ly_snoc (scm_cons (ly_offset2scm (dim),
- scm_list_1
- (scm_cons
- (ly_offset2scm (Offset (0, 0)),
- title->smobbed_copy ()))),
- page->lines_);
- }
+ page->lines_ = ly_snoc (stencil2line (title), page->lines_);
page->lines_ = ly_snoc (line, page->lines_);
page->height_ += h;
h = 0;
Paper_outputter::Paper_outputter (String name)
{
if (safe_global_b)
- {
- gh_define ("security-paranoia", SCM_BOOL_T);
- }
+ scm_define (ly_symbol2scm ("safe-mode?"), SCM_BOOL_T);
file_ = scm_open_file (scm_makfrom0str (name.to_str0 ()),
- scm_makfrom0str ("w"));
+ scm_makfrom0str ("w"));
static SCM find_dumper;
if (!find_dumper)
find_dumper = scm_c_eval_string ("find-dumper");
-
- output_func_ = scm_call_1 (find_dumper,scm_makfrom0str (output_format_global.to_str0 ()));
- output_scheme (gh_cons (ly_symbol2scm ("top-of-file"), SCM_EOL));
+ output_func_
+ = scm_call_1 (find_dumper,
+ scm_makfrom0str (output_format_global.to_str0 ()));
+
+ String creator = gnu_lilypond_version_string ();
+ creator += " (http://lilypond.org)";
+ time_t t (time (0));
+ String time_stamp = ctime (&t);
+ time_stamp = time_stamp.left_string (time_stamp.length () - 1)
+ + " " + *tzname;
+ output_scheme (scm_list_3 (ly_symbol2scm ("header"),
+ scm_makfrom0str (creator.to_str0 ()),
+ scm_makfrom0str (time_stamp.to_str0 ())));
}
Paper_outputter::~Paper_outputter ()
between = stil->get_expr ();
continue;
}
-
- output_expr (stil->get_expr (), ly_scm2offset (head));
+
+ if (stil)
+ output_expr (stil->get_expr (), ly_scm2offset (head));
}
if (is_last)
/paper-size { lilypondpaperpapersize } bind def
%% FIXME: base-line-skip is too big, is this RIGHT?
+%% /line-height 14 staff-space mul def
%% /base-line-skip lilypondpaperlineheight def
%%/base-line-skip lilypondpaperlineheight lilypondpaperoutputscale div def
/base-line-skip 0 def
;; lily specific variables.
(define-public default-script-alist '())
-(define-public security-paranoia #f)
+(define-public safe-mode? #f)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Unassorted utility functions.
(string-append
"\n\\" s "{" (inexact->string i 10) "}" ))
-;;
-;; need to do something to make this really safe.
-;;
+;; FIXME: explain ploblem: need to do something to make this really safe.
(define (output-tex-string s)
- (if security-paranoia
+ (if safe-mode?
(regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
s))
(string-append (select-font name-mag-pair) exp))
-(define (header creator generate)
+(define (header creator time-stamp)
(string-append
"%!PS-Adobe-3.0\n"
- "%%Creator: " creator generate "\n"))
+ "%%Creator: " creator " " time-stamp "\n"
+ ;;(string-append "GNU LilyPond (" (lilypond-version) "), ")
+ ;; (strftime "%c" (localtime (current-time))))
+ ;; FIXME: duplicated in every backend
+ (ps-string-def
+ "lilypond" 'tagline
+ (string-append "Engraved by LilyPond (version " (lilypond-version) ")"))))
(define (header-end)
(string-append
;; (string-append "(" (escape-parentheses s) ") show "))
(string-append "(" (ps-encoding s) ") show "))
-;; top-of-file, wtf?
-(define (top-of-file)
- (string-append
- (header (string-append "GNU LilyPond (" (lilypond-version) "), ")
- (strftime "%c" (localtime (current-time))))
- ;;; ugh
- (ps-string-def
- "lilypond" 'tagline
- (string-append "Engraved by LilyPond (" (lilypond-version) ")"))))
-
(define (unknown)
"\n unknown\n")
(format "Programming error: No such font: ~S" name-mag-pair))
""))))
-;; top-of-file, wtf? ugh: tagline?
-(define (top-of-file)
- (string-append
- "% generated by LilyPond "
- (lilypond-version) " (http://lilypond.org).\n"
- "\\def\\lilypondtagline{Engraved by LilyPond (version "
- (lilypond-version)
- ")}\n"
- ))
-
(define (blank)
"")
"\\lilypondspecial\n"
"\\lilypondpostscript\n"))
-;; Note: this string must match the string in lilypond.py!!!
-(define (header creator generate)
+(define (header creator time-stamp)
(string-append
- "% Generated automatically by: " creator generate "\n"))
+ "% Generated by " creator "\n"
+ "% at " time-stamp "\n"
+ ;; FIXME: duplicated in every backend
+ "\\def\\lilypondtagline{Engraved by LilyPond (version "
+ (lilypond-version)")}\n"))
(define (invoke-char s i)
(string-append
"\n\\" s "{" (inexact->string i 10) "}" ))
-;;
-;; need to do something to make this really safe.
-;;
+;; FIXME: explain ploblem: need to do something to make this really safe.
(define-public (output-tex-string s)
- (if security-paranoia
+ (if safe-mode?
(regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
s))
(#:fill-line
("" (get 'opus))
#:fill-line (#:large #:bigger #:caps (get 'piece) "")))))))
+
+(define-public (make-header paper page-number)
+ (let ((props (list (append `((linewidth . ,(ly:paper-get-number
+ paper 'linewidth))
+ (font-family . roman))
+ (ly:paper-lookup paper 'font-defaults)))))
+
+ (interpret-markup paper props
+ (markup #:fill-line ("" (number->string page-number))))))
+
+
+(define-public (make-footer paper page-number)
+ (let ((props (list (append `((linewidth . ,(ly:paper-get-number
+ paper 'linewidth))
+ (font-family . roman))
+ (ly:paper-lookup paper 'font-defaults)))))
+
+ (interpret-markup paper props
+ (markup #:fill-line ("" (number->string page-number))))))
+
(define-public (paper-set-staff-size sz)
"Function to be called inside a \\paper{} block to set the staff size."
- (let*
- ((m (current-module))
- (ss (/ sz 4))
- (pt (eval 'pt m))
- (mm (eval 'mm m)) )
+ (let* ((m (current-module))
+ (ss (/ sz 4))
+ (pt (eval 'pt m))
+ (mm (eval 'mm m)))
(module-define! m 'fonts (scale-font-list (/ sz (* 20 pt))))
(module-define! m 'staffheight sz)
(module-define! m 'outputscale ss)
(module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
(module-define! m 'blotdiameter (* 0.35 pt))
- (module-define! m 'interscoreline (* 4 mm))
- ;; REMOVEME
- (module-define! m 'lineheight (* 14 ss))))
+ (module-define! m 'interscoreline (* 4 mm))))
(define-public (set-global-staff-size sz)
"Set the default staff size, where SZ is thought to be in PT."
;; todo: take dimension arguments.
-
(define (set-paper-dimensions m w h)
"M is a module (ie. paper->scope_ )"
-
(let* ((mm (eval 'mm m)))
(module-define! m 'hsize w)
(module-define! m 'vsize h)
(module-define! m 'linewidth (- w (* 20 mm)))
(module-define! m 'raggedright #f)
(module-define! m 'packed #f)
- (module-define! m 'indent (/ w 14))))
+ (module-define! m 'indent (/ w 14))
+ ;; page layout
+ (module-define! m 'top-margin (* 3 mm))
+ (module-define! m 'bottom-margin (* 3 mm))
+ (module-define! m 'head-sep (* 4 mm))
+ (module-define! m 'foot-sep (* 4 mm))))
(define-public (set-paper-size name)
- (let*
- ((entry (assoc name paper-alist))
- (pap (eval '$defaultpaper (current-module)))
- (new-paper (ly:output-def-clone pap))
- (m (ly:output-def-scope new-paper))
- (mm (eval 'mm m))
- )
-
+ (let* ((entry (assoc name paper-alist))
+ (pap (eval '$defaultpaper (current-module)))
+ (new-paper (ly:output-def-clone pap))
+ (m (ly:output-def-scope new-paper))
+ (mm (eval 'mm m)))
+
(if (pair? entry)
(begin
(set! entry (eval (cdr entry) m))
(module-define! m 'papersize name)
(module-define! m 'papersizename name)
(set-paper-dimensions m (car entry) (cdr entry))
- (module-define! (current-module) '$defaultpaper new-paper)
- )
- (ly:warning (string-append "Unknown papersize: " name))
- )))
+ (module-define! (current-module) '$defaultpaper new-paper))
+ (ly:warning (string-append "Unknown papersize: " name)))))
projects / lilypond.git / commitdiff