(PREAMBLE_LY): set

toplevel-music-handler too.

diff --git a/ChangeLog b/ChangeLog
index d4f554f56d31f1819919198218fb80a204600324..154e346970c683b22000fa438d9e8ed5219d6333 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-15  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scripts/lilypond-book.py (PREAMBLE_LY): set
+       toplevel-music-handler too.
+
 2004-07-15  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * SConstruct (symlink): Add dvips and music-drawing-routines.ps.

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 2be8e61d8a4d30f71a0481295586837537c4815c..b1eea6655bc0bc00ce3e20b0b4a56011da1aa245 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -104,8 +104,8 @@ Copyright @copyright{} 1999--2004 by the authors
 
 @vskip 20pt
 
-%% Not yet debugged or reported.  This crashes gs-8.01:
-%% compiling gs-8.01 right now... -- jcn
+@c Not yet debugged or reported.  This crashes gs-8.01:
+@c compiling gs-8.01 right now... -- jcn
 @lilypond[raggedright]
 \score {
     \context Lyrics \notes {

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 83c9e80c529f42c888d3116fa5f7d1a7f29118db..68ad35824c6afe25138f64456aa2ff1841e6a406 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -670,8 +670,8 @@ to group expressions.
 
 Like mathematical expressions, music expressions can be nested
 arbitrarily deep@footnote{The reason for getting three staves in the
-previous example but just a single staff in current one will be explained
-later.}
+previous example but just a single staff in the current one will be
+explained later.}
 
 @lilypond[quote,verbatim,relative=2] 
 {

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 42e842ff3b6541425e837898bb67598984d3c6f7..17547abad170ad9ec16a45307fb19d4c0bfbf6b3 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-15 17:25+0200\n"
+"POT-Creation-Date: 2004-07-15 23:40+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -127,11 +127,19 @@ msgid ""
 "\n"
 msgstr ""
 
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+<<<<<<< lilypond.pot
 #. Bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format.
 #. Bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format.
 #: lilypond-book.py:82 old-lilypond-book.py:123 main.cc:138 lily/main.cc:125
+=======
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#: lilypond-book.py:82 old-lilypond-book.py:123 main.cc:138 lily/main.cc:125
+>>>>>>> 1.39
 msgid "EXT"
 msgstr ""
 
@@ -719,8 +727,14 @@ msgstr ""
 msgid "Error parsing AFM file: `%s'"
 msgstr ""
 
+<<<<<<< lilypond.pot
+#. FIXME: broken sentence
+#. FIXME: broken sentence
+#: all-font-metrics.cc:100 lily/all-font-metrics.cc:95
+=======
 #. FIXME: broken sentence
 #: all-font-metrics.cc:100 lily/all-font-metrics.cc:95
+>>>>>>> 1.39
 #, c-format
 msgid "checksum mismatch for font file: `%s'"
 msgstr ""
@@ -826,6 +840,13 @@ msgstr ""
 #.
 #. last->translator_id_string_  = get_change ()->change_to_id_string_;
 #.
+<<<<<<< lilypond.pot
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
 #.
 #. We could change the current translator's id, but that would make
 #. errors hard to catch
@@ -833,6 +854,15 @@ msgstr ""
 #. last->translator_id_string ()  = get_change ()->change_to_id_string ();
 #.
 #: change-iterator.cc:93 lily/change-iterator.cc:93
+=======
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#: change-iterator.cc:93 lily/change-iterator.cc:93
+>>>>>>> 1.39
 msgid "I'm one myself"
 msgstr ""
 
@@ -1174,8 +1204,14 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
+<<<<<<< lilypond.pot
+#. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
+#: main.cc:196 lily/main.cc:181
+=======
 #. No version number or newline here.  It confuses help2man.
 #: main.cc:196 lily/main.cc:181
+>>>>>>> 1.39
 #, c-format
 msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr ""
@@ -1272,6 +1308,10 @@ msgstr ""
 msgid "Braces don't match"
 msgstr ""
 
+#.
+#. music for the softenon children?
+#.
+<<<<<<< lilypond.pot
 #.
 #. music for the softenon children?
 #.
@@ -1279,6 +1319,12 @@ msgstr ""
 #. music for the softenon children?
 #.
 #: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:153
+=======
+#.
+#. music for the softenon children?
+#.
+#: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:153
+>>>>>>> 1.39
 msgid "music for the martians."
 msgstr ""
 
@@ -1471,9 +1517,16 @@ msgid "Scheme encoding: "
 msgstr ""
 
 #. this shouldn't happen, but let's continue anyway.
+<<<<<<< lilypond.pot
+#. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
+#: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53
+#: lily/separation-item.cc:97
+=======
 #. this shouldn't happen, but let's continue anyway.
 #: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53
 #: lily/separation-item.cc:97
+>>>>>>> 1.39
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
@@ -1486,11 +1539,19 @@ msgstr ""
 msgid "unterminated slur"
 msgstr ""
 
+#. How to shut up this warning, when Voice_devnull_engraver has
+#. eaten start event?
+<<<<<<< lilypond.pot
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start event?
 #. How to shut up this warning, when Voice_devnull_engraver has
 #. eaten start event?
 #: slur-engraver.cc:139 lily/slur-engraver.cc:139
+=======
+#. How to shut up this warning, when Voice_devnull_engraver has
+#. eaten start event?
+#: slur-engraver.cc:139 lily/slur-engraver.cc:139
+>>>>>>> 1.39
 msgid "can't find start of slur"
 msgstr ""
 
@@ -1569,9 +1630,17 @@ msgstr ""
 
 #. Not using ngettext's plural feature here, as this message is
 #. more of a programming error.
+<<<<<<< lilypond.pot
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#: tfm-reader.cc:108 lily/tfm-reader.cc:108
+=======
 #. Not using ngettext's plural feature here, as this message is
 #. more of a programming error.
 #: tfm-reader.cc:108 lily/tfm-reader.cc:108
+>>>>>>> 1.39
 #, c-format
 msgid "TFM header of `%s' has only %u word (s)"
 msgstr ""
@@ -1589,11 +1658,19 @@ msgstr ""
 msgid "no one to print a tuplet start bracket"
 msgstr ""
 
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+<<<<<<< lilypond.pot
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
 #: time-signature.cc:95 lily/time-signature.cc:95
+=======
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#: time-signature.cc:95 lily/time-signature.cc:95
+>>>>>>> 1.39
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
@@ -1603,12 +1680,26 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
+<<<<<<< lilypond.pot
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57
+=======
 #.
 #. Todo: should make typecheck?
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
 #: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57
+>>>>>>> 1.39
 #, c-format
 msgid "Found strange time signature %d/%d."
 msgstr ""
@@ -1765,6 +1856,54 @@ msgstr ""
 #: lexer.ll:755 lexer.ll:756
 msgid "Consider updating the input with the convert-ly script"
 msgstr ""
+<<<<<<< lilypond.pot
+
+#: lily/apply-context-iterator.cc:35
+msgid "\\applycontext argument is not a procedure"
+msgstr ""
+
+#: lily/axis-group-engraver.cc:116
+msgid ""
+"Axis_group_engraver: vertical group already has a parent.\n"
+"Do you have two Axis_group_engravers?\n"
+"Killing this vertical group."
+msgstr ""
+
+#: lily/kpath.cc:129
+#, c-format
+msgid "kpathsea can not find file: `%s'"
+msgstr ""
+
+#: lily/my-lily-parser.cc:274
+#, c-format
+msgid "can't find init file: `%s'"
+msgstr ""
+
+#: lily/rest-collision.cc:157
+msgid "Too many colliding rests."
+msgstr ""
+
+#: lily/scm-option.cc:62
+#, c-format
+msgid ""
+"  The function ly:set-option allows for access to some internal variables."
+msgstr ""
+
+#: lily/scm-option.cc:66
+#, c-format
+msgid "Use help as  SYMBOL to get online help."
+msgstr ""
+
+#: lily/scm-option.cc:133 lily/scm-option.cc:161
+#, c-format
+msgid "No such internal option: %s"
+msgstr ""
+
+#: lily/new-lyric-combine-music-iterator.cc:230
+#, c-format
+msgid "Haven't found Voice `%s'."
+msgstr ""
+=======
 
 #: lily/apply-context-iterator.cc:35
 msgid "\\applycontext argument is not a procedure"
@@ -1811,3 +1950,4 @@ msgstr ""
 #, c-format
 msgid "No such internal option: %s"
 msgstr ""
+>>>>>>> 1.39

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 8fa0c17e6b5fbb7ede175a6e45c2658d9afdc63e..e268f4173ace521e6143b09b614f309ff7ee5044 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -141,7 +141,7 @@
 (define (dump-page putter page last?)
   (ly:outputter-dump-string
    putter
-   "\n\\vbox to 0pt{%\n\\leavevmode\n\\lybox{0}{0}{0}{0}{%\n")
+   "\\vbox to 0pt{%\n\\leavevmode\n\\lybox{0}{0}{0}{0}{%\n")
   (ly:outputter-dump-stencil putter page)
   (ly:outputter-dump-string
    putter

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 551f1e382d8d37a1bc69ff5a97a32cccbd2bd089..618390253bc4bbbdce43a09e159a93424b2a9117 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -298,7 +298,11 @@ output = {
 
 PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 %%%% Options: [%(option_string)s]
-#(define toplevel-score-handler ly:parser-print-score)
+#(set! toplevel-score-handler ly:parser-print-score)
+#(set! toplevel-music-handler (lambda (p m)
+                              (ly:parser-print-score
+                               p (ly:music-scorify m))
+                           ))
 %(preamble_string)s
 \paper {%(paper_string)s
 }