* scm/tex.scm (header-end): enclose lily output in begingroup/endgroup.

* tex/lilyponddefs.tex: set hsize for plain tex.

diff --git a/ChangeLog b/ChangeLog
index 07996b3db88ec3d6c2afe795f36abd24f5971c96..07f48938224d701cc9839edd214b67b4dd9c9162 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-21  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scm/tex.scm (header-end): enclose lily output in begingroup/endgroup.
+
+       * tex/lilyponddefs.tex: set hsize for plain tex.
+
 2002-09-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * tex/lilyponddefs.tex: Handle \scoreshift and \outputscale in one

diff --git a/scm/tex.scm b/scm/tex.scm
index 9015e04961377ab6bbd11ed780f3b7fab14b9308..399dafd51a651637c322980afd6f0c51755f7f3e 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -142,7 +142,7 @@
   (begin
                                        ; uncomment for some stats about lily memory      
                                        ;               (display (gc-stats))
-    (string-append "%\n\\EndLilyPondOutput\n"
+    (string-append "%\n\\endgroup\\EndLilyPondOutput\n"
                                        ; Put GC stats here.
                   )))
 
@@ -181,7 +181,7 @@
    "}"
    "\\input lilyponddefs\n"
    "\\outputscale=\\lilypondpaperoutputscale \\lilypondpaperunit\n"
-   "\\turnOnPostScript\n"))
+   "\\turnOnPostScript\\begingroup\\parindent0pt\n"))
 
 ;; Note: this string must match the string in ly2dvi.py!!!
 (define (header creator generate) 

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index acacba8e3db41ce8396528a2815d9e2015c026c6..60d779795f90a1d6c092a7fec4d4401b506cdec0 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -40,6 +40,9 @@
 
 \ifundefined{documentclass}
   \input lilypond-plaintex
+
+%% make plain work ok Out Of The Box 
+  \hsize=\lilypondpaperlinewidth\lilypondpaperunit
 \else
   \input lilypond-latex
 \fi