* lily/paper-book.cc (classic_output):

* tex/lilyponddefs.tex (lybox): Add height, and proper raising.
Fixes classic output.
(lilypondstart):
* scripts/lilypond.py (global_latex_preamble): Remove topmargin
kludge.

* scripts/lilypond.py: Remove LaTeX titling kludge.  Remove page
layout tweaking.

diff --git a/ChangeLog b/ChangeLog
index 628884190fd758ecbdf2a7e617700a7c59b9615c..b763d6e7dc3d7431a9d0c7808181aed02934ab67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-04-10  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/paper-book.cc (classic_output): 
+       * tex/lilyponddefs.tex (lybox): Add height, and proper raising.
+       Fixes classic output.
+       (lilypondstart):
+       * scripts/lilypond.py (global_latex_preamble): Remove topmargin
+       kludge.
+
        * scripts/old-lilypond-book.py: Remove.
 
        Page layout for SCOREs enclosed in a BOOK:

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index eaa8acd5bea845e323b797292384a87aa4724082..3cea1e132716a49663f2595f28cf7f35a6fe34f8 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -310,7 +310,9 @@ Paper_book::classic_output (String outname)
   Paper_outputter *out = papers_.top ()->get_paper_outputter (outname);
   out->output_header (papers_.top (), scopes (count - 1), 0);
 
-  Offset o (0, 0);
+  Paper_line *first = unsmob_paper_line (scm_vector_ref (scores_.top (),
+                                                        scm_int2num (0)));
+  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)),

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 0e75869197ebda574c9c188d42989c42c4555dd2..590bb0d44117c960d20d33659f11cee97b26e846 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -255,6 +255,8 @@
 (define (end-output)
   "\nend-lilypond-output\n")
 
+(define end-output-classic end-output)
+
 (define (ez-ball ch letter-col ball-col)
   (string-append
    " (" ch ") "

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index d9c87df9ca3f79c96195624d22cc8e5a8633744c..a4c65d6c317814c586bc9aa075fafca9d1a822f0 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -216,7 +216,7 @@
 (define (comment s)
   (string-append "% " s "\n"))
 
-(define (end-output) 
+(define (end-output)
   (begin
     ;; uncomment for some stats about lily memory        
     ;; (display (gc-stats))
@@ -225,9 +225,6 @@
      ;; Put GC stats here.
      )))
 
-(define (experimental-on)
-  "")
-
 (define (repeat-slash w a t)
   (embedded-ps (list 'repeat-slash  w a t)))
 

diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index bb9930c6d8ec135989e8d159ebca4c7faf816898..7511467cd8f818b654ce533a00230c4768238b0e 100644 (file)
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -371,8 +371,6 @@ def global_latex_preamble (extra):
 %% Nullify [La]TeX page layout settings, page layout by LilyPond.
 \pagestyle{empty}
 \topmargin-1in
-%% FIXME: empirical computer science: page is ca 5mm too low.
-\advance\topmargin-5mm
 \headheight0pt\headsep0pt
 \oddsidemargin-1in
 \evensidemargin\oddsidemargin

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 2ed92bbe2a8a8abd4a1a412ea1c9af7373e41647..f71b45285e29742846b5855f6486bec16a3f16f3 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -58,8 +58,6 @@
         %% Nullify [La]TeX page layout settings, page layout by LilyPond.
         \pagestyle{empty}
         \topmargin-1in
-        %% FIXME: empirical computer science: page is ca 5mm too low.
-        \advance\topmargin-5mm
         \headheight0pt\headsep0pt
         \oddsidemargin-1in
         \evensidemargin\oddsidemargin
@@ -115,15 +113,14 @@
 \gdef\lyitem#1#2#3{
   \topalign{\raise#2\outputscale\leftalign{\kern#1\outputscale#3}}}
 
-\gdef\XXXlybox#1#2#3#4#5{
-  \vbox to #4\outputscale{
-    \hbox to #3\outputscale{
-      \leftalign{\kern#1\outputscale\lower#2\outputscale\topalign{#5}}}
-    \hss}\vss}
-
-%% FIXME: no dimensions, should fix at toplevel
+\newdimen\lytempdim
 \gdef\lybox#1#2#3#4#5{
-  \leftalign{\kern#1\outputscale\lower#2\outputscale\topalign{#5}}}
+  \lytempdim\baselineskip
+  \advance\lytempdim-#4\outputscale
+  \raise\lytempdim
+  \vbox to#4\outputscale{
+    \leftalign{\kern#1\outputscale\lower#2\outputscale\topalign{#5}}
+    \vss}}
 
 \gdef\lyvrule#1#2#3#4{
   \kern#1\outputscale