remove texttagline.

diff --git a/ChangeLog b/ChangeLog
index f9070154d7f457a13bc0ecc42fbfc320f02ed920..f9b6656f97ddcec6caf40233b8213ce0a7caf964 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/mutopia/W.A.Mozart/mozart-hrn-3.ly:
+       remove texttagline.
+       
        * lily/new-slur.cc: cleanup, split in functions.
 
        * lily/parser.yy (chord_body_element): allow octave-check = inside

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 5f6e72f11d88c0aed1c4183e2b4a68bb2ddd6230..f0b5ac1cf10039829501e4921131692cfdaa7a56 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -444,7 +444,7 @@ They are combined by sending both to the same @context{Voice} context,
   >>
 @end verbatim
 @lilypond[raggedright]
-music = \notes { c4  50 c4 }
+music = \notes { c4   c4 }
 arts = \notes  { s4-. s4-> }
 \score {
   \notes \relative c''  << \new Staff \context Voice = "A" \music

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index aa670c656421156f54997b4a8e5e805e3070d53f..46184fe9c5d79c33040eeb121b5e746445cb8471 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -1,4 +1,4 @@
-\header{
+5\header{
   title =       "Konzert Nr. 3 Es dur"
   subtitle = "für Horn und Orchester"
   composer =    "Wolfgang Amadeus Mozart (1756-1791)"
@@ -19,20 +19,17 @@
   source = "Edition Breitkopf 2563"
   footer = "Mutopia-2002/05/21-25"
 
-  textagline = "\\parbox{\hsize}{\\thefooter\\quad\\small This music is part of the Mutopia project, \\texttt{http://sca.uwaterloo.ca/Mutopia/}. It has been typeset and placed in the public domain by " + \maintainer + ". Unrestricted modification and redistribution is permitted and encouraged---copy this music and share it!}"
-  
-  %% TODO: handle \footer, \head[er] properly
   tagline = \markup { \smaller
       \column <
           \fill-line < \footer "" >
-          \fill-line < { "This music is part of the Mutopia project, "
+          \fill-line < { "This music is part of the Mutopia project,"
                          \typewriter { "http://sca.uwaterloo.ca/Mutopia/" }
-                         "." } >
-          \fill-line < { "It has been typeset and placed in the public "
-                         "domain by "  \maintainer  "." } >
-          \fill-line < { "Unrestricted modification and redistribution "
-                         "is permitted and encouraged---copy this music "
-                         "and share it!" } >
+                        } >
+          \fill-line < #(ly:export (string-append "It has been typeset and placed in the public "
+                         "domain by"  maintainer  "."))  >
+          \fill-line < #(ly:export (string-append "Unrestricted modification and redistribution"
+                         "is permitted and encouraged---copy this music"
+                         "and share it!")) >
           >
        }
 }

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 563cdb76c0fa6c2f12b5d7f1a68565d9fce3bee7..5d230c1afb206989bab0b5c3975be2a4a69b7271 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-17 13:18+0200\n"
+"POT-Creation-Date: 2004-07-18 15:06+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"
@@ -149,6 +149,8 @@ msgstr ""
 #. for --output-format.
 #. 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
 msgid "EXT"
 msgstr ""
@@ -747,6 +749,7 @@ msgstr ""
 #. FIXME: broken sentence
 #. FIXME: broken sentence
 #. FIXME: broken sentence
+#. FIXME: broken sentence
 #: all-font-metrics.cc:100 lily/all-font-metrics.cc:95
 #, c-format
 msgid "checksum mismatch for font file: `%s'"
@@ -913,6 +916,12 @@ msgstr ""
 #.
 #. 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
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
 #: change-iterator.cc:93 lily/change-iterator.cc:93
 msgid "I'm one myself"
 msgstr ""
@@ -1265,6 +1274,7 @@ msgstr ""
 #. No version number or newline here.  It confuses help2man.
 #. No version number or newline here.  It confuses help2man.
 #. 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
 #, c-format
 msgid "Usage: %s [OPTIONS]... FILE..."
@@ -1395,6 +1405,9 @@ msgstr ""
 #.
 #. music for the softenon children?
 #.
+#.
+#. music for the softenon children?
+#.
 #: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:153
 msgid "music for the martians."
 msgstr ""
@@ -1508,11 +1521,11 @@ msgstr ""
 msgid "rest `%s' not found"
 msgstr ""
 
-#: rest-collision.cc:145 lily/rest-collision.cc:145
+#: rest-collision.cc:145 lily/rest-collision.cc:145 lily/rest-collision.cc:146
 msgid "rest direction not set.  Cannot resolve collision."
 msgstr ""
 
-#: rest-collision.cc:193 lily/rest-collision.cc:200
+#: rest-collision.cc:193 lily/rest-collision.cc:200 lily/rest-collision.cc:201
 msgid "too many colliding rests"
 msgstr ""
 
@@ -1598,6 +1611,7 @@ msgstr ""
 #. this shouldn't happen, but let's continue anyway.
 #. this shouldn't happen, but let's continue anyway.
 #. 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
 msgid "Separation_item:  I've been drinking too much"
@@ -1634,6 +1648,8 @@ msgstr ""
 #. eaten start event?
 #. 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
 msgid "can't find start of slur"
 msgstr ""
@@ -1657,12 +1673,12 @@ msgstr ""
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
-#: stem.cc:648 lily/stem.cc:577 lily/stem.cc:589
+#: stem.cc:648 lily/stem.cc:577 lily/stem.cc:589 lily/stem.cc:599
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:661 lily/stem.cc:588 lily/stem.cc:600
+#: stem.cc:661 lily/stem.cc:588 lily/stem.cc:600 lily/stem.cc:610
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
@@ -1733,6 +1749,8 @@ msgstr ""
 #. more of a programming error.
 #. 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
 #, c-format
 msgid "TFM header of `%s' has only %u word (s)"
@@ -1773,6 +1791,8 @@ msgstr ""
 #. (Here really with a warning!)
 #. 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
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
@@ -1833,6 +1853,11 @@ msgstr ""
 #.
 #. 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
 #, c-format
 msgid "Found strange time signature %d/%d."
@@ -2017,7 +2042,7 @@ msgstr ""
 msgid "Haven't found Voice `%s'."
 msgstr ""
 
-#: lily/rest-collision.cc:157
+#: lily/rest-collision.cc:157 lily/rest-collision.cc:158
 msgid "Too many colliding rests."
 msgstr ""