From 4e288c484bb01fcfba0e191fe0cd2fc161308836 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 11 Apr 2004 21:22:21 +0000 Subject: [PATCH] (classic_output): don't advance Offset for TeX output. --- ChangeLog | 3 +++ input/mutopia/J.S.Bach/wtk1-fugue2.ly | 2 -- lily/paper-book.cc | 10 ++++++++-- lily/paper-outputter.cc | 1 + lily/score.cc | 5 +---- make/lilypond.redhat.spec.in | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9db6dded3..7619a19332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-04-11 Han-Wen Nienhuys + * lily/paper-book.cc (classic_output): don't advance Offset for + TeX output. + * make/mutopia-rules.make ($(outdir)-$(PAPERSIZE)/%.dvi): incude ec-sauter.map in rules diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 53e2c18de4..dcafad7c5f 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -190,7 +190,6 @@ bassdux = \context Voice=three \notes \relative c' { } \score { - \notes \context PianoStaff << \override Score.TimeSignature #'style = #'C \context Staff = treble << @@ -221,4 +220,3 @@ bassdux = \context Voice=three \notes \relative c' { } } - diff --git a/lily/paper-book.cc b/lily/paper-book.cc index 8620970ab1..8c26fa9840 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -317,8 +317,14 @@ Paper_book::classic_output (String outname) Offset o (0, -0.5 * first->dim ()[Y_AXIS]); int line_count = SCM_VECTOR_LENGTH ((SCM) scores_.top ()); for (int i = 0; i < line_count; i++) - out->output_line (scm_vector_ref ((SCM) scores_.top (), scm_int2num (i)), - &o, i == line_count - 1); + { + if (output_format_global == "tex") + o = Offset (0,0); + + out->output_line (scm_vector_ref ((SCM) scores_.top (), + scm_int2num (i)), + &o, i == line_count - 1); + } out->output_scheme (scm_list_1 (ly_symbol2scm ("end-output"))); progress_indication ("\n"); diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 98ad110a2c..8540ae1efb 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -182,6 +182,7 @@ Paper_outputter::output_line (SCM line, Offset *origin, bool is_last) (*origin)[Y_AXIS] += dim[Y_AXIS]; } + void Paper_outputter::output_music_output_def (Music_output_def* odef) { diff --git a/lily/score.cc b/lily/score.cc index 811e2f2cfa..00da8b5f77 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -173,11 +173,8 @@ default_rendering (SCM music, SCM outdef, SCM header, SCM outname) Paper_score *ps = dynamic_cast (output); paper_book->papers_.push (ps->paper_); paper_book->scores_.push (systems); - - // fixme. - //paper_book->global_headers_.push (global_input_file->header_); - paper_book->headers_.push (header); + paper_book->classic_output (ly_scm2string (outname)); scm_gc_unprotect_object (paper_book->self_scm ()); } diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 049cba2402..14b1c6e6af 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -18,7 +18,7 @@ Buildrequires: t1utils bison flex mftrace ImageMagick Buildrequires: texinfo >= 4.6 Buildrequires: guile-devel >= 1.6.4-8 Requires: tetex tetex-latex libstdc++ python tetex-dvips tetex-latex -Requires: guile >= 1.6.4-8 +Requires: guile >= 1.6.4-8 ec-fonts-mftraced %description LilyPond lets you create music notation. It produces -- 2.39.2