*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 259875c5eb0e71064d3e63dca86154656742dd17..0e27ffba52a8a023841c575873108badcb670e06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-07-17  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * scm/define-grobs.scm: switch on new-slur by default.
-
+g
        * lily/scm-option.cc: symbol != string.
 
        * lily/new-slur.cc (set_end_points): handle broken slurs. Doesn't

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 564f6c1863e2470c222d26d362a571e286c5cd7d..d3515bc5dfe5837049262227c3dcb80364d2345e 100644 (file)
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -57,7 +57,7 @@ s4_" "
 @item @code{\time 3/4 \time 4/4 }
 @tab time signature
 @tab
-@lilypond
+@lilypond[fragment]
 \override Staff.Clef   #'transparent = ##t 
 \time 3/4
 s4_" "
@@ -69,7 +69,7 @@ s16_" "
 @item @code{r4 r8}
 @tab rest 
 @tab
-@lilypond[relative=2,notime]
+@lilypond[relative=2,notime,fragment]
 \set Staff.Clef = \turnOff
 r4 r8
 @end lilypond
@@ -77,7 +77,7 @@ r4 r8
 @item @code{d ~ d}
 @tab tie
 @tab
-@lilypond[relative=2,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 d ~ d
@@ -86,7 +86,7 @@ d ~ d
 @item @code{\key es \major }
 @tab key signature
 @tab
-@lilypond[notime]
+@lilypond[notime,fragment]
 \clef treble
 \key es \major
 s4 
@@ -95,7 +95,7 @@ s4
 @item @var{note}@code{'}
 @tab raise octave
 @tab
-@lilypond[relative=2,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 a a'
@@ -104,7 +104,7 @@ a a'
 @item @var{note}@code{,}
 @tab lower octave
 @tab
-@lilypond[relative=2,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 c c,

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 7dba103d57b24162c1c91b44d999bee0f9ff18e7..5048fc28a22e03fc32a8e312dbea963b5c944851 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -599,7 +599,7 @@ of music engraving into a computer program.  Thanks to all that hard
 work, the program can now be used to perform useful tasks.  The
 simplest application is printing notes.
 
-@lilypond[quote,relative=1]
+@lilypond[quote,relative=1,fragment]
 \time 2/4 c4 c g'4 g a4 a g2
 @end lilypond
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 74fa827f560ad070ba83bb3ab9a775ebcfb75c4a..54e6efe62a24d6e95f7ba7dad2f1d419b526bf79 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -107,7 +107,7 @@ Half-flats and half-sharps are formed by adding @code{-eh} and
 @cindex quarter tones
 @cindex semi-flats, semi-sharps
 
-@lilypond[quote,verbatim,relative=3]
+@lilypond[fragment,quote,verbatim,relative=3]
 ceses4
 ceseh
 ces
@@ -206,7 +206,7 @@ A chord is formed by a enclosing a set of pitches in @code{<} and
 @code{>}. A chord may be followed by  a duration, and a set of
 articulations, just like simple notes.
 
-@lilypond[quote,relative=1]
+@lilypond[fragment,quote,relative=1]
 <c e g>4 <c>8 <>8 
 @end lilypond
 
@@ -219,7 +219,7 @@ articulations, just like simple notes.
 
 Rests are entered like notes, with the note name @code{r}
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[fragment,quote,raggedright,verbatim]
 r1 r2 r4 r8
 @end lilypond
 
@@ -235,7 +235,7 @@ leave these rests alone
 
 @cindex @code{\rest}
  
-@lilypond[quote,raggedright,verbatim]
+@lilypond[fragment,quote,raggedright,verbatim]
 a'4\rest d'4\rest
 @end lilypond
 
@@ -254,7 +254,7 @@ Program reference: @internalsref{RestEvent}, and @internalsref{Rest}.
 An invisible rest (also called a `skip') can be entered like a note
 with note name `@code{s}' or with @code{\skip @var{duration}}
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[fragment,quote,raggedright,verbatim]
 a2 s4 a4 \skip 1 a4 
 @end lilypond
 
@@ -1417,7 +1417,7 @@ all 16th or shorter beams at beat positions, as defined by the
 @code{beatLength} property.
 
 
-@lilypond[quote,relative=2,verbatim,noindent]
+@lilypond[fragment,quote,relative=2,verbatim,noindent]
 c16[ c c c c c c c]
 \set subdivideBeams = ##t
 c16[ c c c c c c c]
@@ -4338,7 +4338,7 @@ and @internalsref{Staff}.@code{instr}. This will print a string before
 the start of the staff. For the first start, @code{instrument} is
 used, for the next ones @code{instr} is used.
 
-@lilypond[quote,verbatim,raggedright,relative=1]
+@lilypond[quote,verbatim,raggedright,relative=1,fragmen]
 \set Staff.instrument = "Ploink "
 \set Staff.instr = "Plk "
 c1

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 68ad35824c6afe25138f64456aa2ff1841e6a406..0aa1189ec13049abb761769d5e5d20d78ed87be1 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -23,7 +23,7 @@ picture in the HTML version of this manual, you will see the exact
 LilyPond input that was used to generate that image.
 Try it on this image
 
-@lilypond[quote,raggedright,relative=2]
+@lilypond[fragment,quote,raggedright,relative=2]
 c-\markup { \bold \huge { Click here.  } }
 @end lilypond
 @end ifhtml
@@ -76,7 +76,7 @@ c d e f g a b
 @noindent
 the result looks like this
 
-@lilypond[quote,notime,relative=1]
+@lilypond[fragment,quote,notime,relative=1]
 c d e f g a b
 @end lilypond
 
@@ -89,7 +89,7 @@ a1 a2 a4 a16 a32
 @end example
 
 @c FIXME: have NOTIME also remove Score.timing?
-@lilypond[quote,notime,relative=1]
+@lilypond[fragment,quote,notime,relative=1]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 { a1 a2 a4 a16 a32 s16_" " }
@@ -103,7 +103,7 @@ defaults to a quarter
 a a8 a a2 a
 @end example
 
-@lilypond[quote,notime,relative=1]
+@lilypond[fragment,quote,notime,relative=1]
 \set Score.timing = ##f
 { a a8 a a2 a s16_" " }
 @end lilypond
@@ -116,7 +116,7 @@ Rests are entered just like notes, but with the name @samp{r}
 r2 r4 r8 r16
 @end example
 
-@lilypond[quote,notime]
+@lilypond[fragment,quote,notime]
 \set Score.timing = ##f
 r2 r4 r8 r16 s16_" "
 @end lilypond
@@ -127,7 +127,7 @@ Add a dot @samp{.} after the duration to get a @rglos{dotted note}
 a2. a4 a8. a16
 @end example
 
-@lilypond[quote,notime,relative=1]
+@lilypond[fragment,quote,notime,relative=1]
 \set Score.timing = ##f
 { a2. a4 a8. a16 s16_" " }
 @end lilypond
@@ -142,7 +142,7 @@ The @rglos{meter} (or @rglos{time signature}) can be set with the
 @end example
 
 @c A clef here may lead to confusion, remove it.
-@lilypond[quote]
+@lilypond[fragment,quote]
 \override Staff.Clef #'transparent = ##t 
 \time 3/4
 s4_" "
@@ -164,7 +164,7 @@ The @rglos{clef} can be set using the @code{\clef} command
 \clef tenor
 @end example
 
-@lilypond[quote,notime]
+@lilypond[fragment,quote,notime]
 \set Score.timing = ##f
 \clef violin
 s4_" "
@@ -213,7 +213,7 @@ and the music will be converted to printable output.
 Remember to enclose the notes and commands in curly braces
 @code{@{@tie{}@dots{}@tie{}@}} to convert it to printable output.
 
-@lilypond[quote,noindent,linewidth=55\staffspace]
+@lilypond[fragment,quote,noindent,linewidth=55\staffspace]
 {
   \time 3/4
   \clef bass
@@ -342,7 +342,7 @@ like German and Dutch.}
 cis1 ees fisis aeses
 @end example
 
-@lilypond[quote,notime]
+@lilypond[fragment,quote,notime]
 \set Score.timing = ##f
 \transpose c c' { cis1 ees fisis aeses s16_" " }
 @end lilypond
@@ -358,7 +358,7 @@ g1
 g
 @end example
 
-@lilypond[quote,notime,fragment]
+@lilypond[fragment,quote,notime,fragment]
 \key d \major
 g'1
 \key c \minor
@@ -488,7 +488,7 @@ ugr: removing the ignore block, leaving the comment line below
 @end ignore
 
 
-@lilypond[quote,noindent,linewidth=50\staffspace]
+@lilypond[fragment,quote,noindent,linewidth=50\staffspace]
 \transpose c c' {
   \time 4/4
   \key g \minor
@@ -609,14 +609,14 @@ In input files, music is represent by so-called @emph{music
 expression}.  We have already seen in the previous examples; 
 a single note is a music expression
 
-@lilypond[quote,verbatim,relative=3]
+@lilypond[fragment,quote,verbatim,relative=3]
 a4
 @end lilypond
 
 Enclosing group of notes in braces creates a new music
 expression
 
-@lilypond[quote,verbatim,relative=3]
+@lilypond[fragment,quote,verbatim,relative=3]
 { a4 g4 }
 @end lilypond
 
@@ -626,7 +626,7 @@ expression, which can be grouped with other expressions sequentially.
 Here, the expression from the previous example is combined with two
 notes
 
-@lilypond[quote,verbatim,relative=3]
+@lilypond[fragment,quote,verbatim,relative=3]
 { { a4 g } f g } 
 @end lilypond
 
@@ -638,7 +638,7 @@ music expression is formed by enclosing expressions in @code{<<} and
 @code{>>}.  In the following example, three sequences (all containing
 two notes) are combined simultaneously
 
-@lilypond[quote,verbatim,relative=3]
+@lilypond[fragment,quote,verbatim,relative=3]
 <<
    { a4 g }
    { f e }
@@ -673,7 +673,7 @@ arbitrarily deep@footnote{The reason for getting three staves in the
 previous example but just a single staff in the current one will be
 explained later.}
 
-@lilypond[quote,verbatim,relative=2] 
+@lilypond[fragment,quote,verbatim,relative=2] 
 {
   c <<c e>>
   << { e f } { c <<b d>> } >>
@@ -746,7 +746,7 @@ We can now typeset a melody with two staves
 
 @c TODO: (c) status of this Paul McCartney (?) song (let's all stand together)
 
-@lilypond[quote,verbatim,raggedright]
+@lilypond[fragment,quote,verbatim,raggedright]
 <<
   \new Staff {
     \time 3/4
@@ -778,7 +778,7 @@ For more information on context see the description in
 Common accents can be added to a note using a dash (@samp{-}) and a
 single character
 
-@lilypond[quote,verbatim,relative=2]
+@lilypond[fragment,quote,verbatim,relative=2]
 c-.  c-- c-> c-^ c-+ c-_
 @end lilypond
 
@@ -786,7 +786,7 @@ c-.  c-- c-> c-^ c-+ c-_
 Similarly, fingering indications can be added to a note using a dash
 (@samp{-}) and the digit to be printed
 
-@lilypond[quote,verbatim,relative=2]
+@lilypond[fragment,quote,verbatim,relative=2]
 c-3 e-5 b-2 a-1
 @end lilypond
 
@@ -794,7 +794,7 @@ c-3 e-5 b-2 a-1
 Dynamic signs are made by adding the markings (with a backslash) to
 the note
 
-@lilypond[quote,verbatim,relative=2]
+@lilypond[fragment,quote,verbatim,relative=2]
 c\ff c\mf
 @end lilypond
 
@@ -806,7 +806,7 @@ Crescendi and decrescendi are started with the commands @code{\<} and
 @code{\>}.  An ending dynamic, for example @code{\f}, will finish the
 crescendo, or the command @code{\!} can be used
 
-@lilypond[quote,verbatim,relative=2]
+@lilypond[fragment,quote,verbatim,relative=2]
 c2\< c2\ff\> c2 c2\!
 @end lilypond
 
@@ -818,7 +818,7 @@ A slur is a curve drawn across many notes, and indicates legato
 articulation.  The starting note and ending note are marked with
 @samp{(} and @samp{)}, respectively
 
-@lilypond[quote,fragment,relative=2,verbatim]
+@lilypond[fragment,quote,fragment,relative=2,verbatim]
 d4( c16)( cis d e c cis d e)( d4)
 @end lilypond
 
@@ -1037,7 +1037,7 @@ line}.  It is entered as two underscores, i.e.,
 @{ I want to break free __ @}
 @end example 
 
-@lilypond[quote,raggedright]
+@lilypond[fragment,quote,raggedright]
 <<
   \relative {
     r4 c \times 2/3 { f g g }
@@ -1054,7 +1054,7 @@ resulting in a centered hyphen between two syllables
 Twin -- kle twin -- kle
 @end example
 
-@lilypond[quote,raggedright]
+@lilypond[fragment,quote,raggedright]
 <<
   \relative {
      \time 2/4
@@ -1095,7 +1095,7 @@ to explicitly specify a @code{Lyrics} context,
 
 The melody for this song is as follows
 
-@lilypond[quote,fragment,relative=2]
+@lilypond[fragment,quote,fragment,relative=2]
 r4 c \times 2/3 { f4 g g }
 \times 2/3 { g4( a2) }
 @end lilypond
@@ -1686,7 +1686,7 @@ example,
 If there is no @code{\score} block in the fragment,
 @code{lilypond-book} will supply one
 
-@lilypond[quote]
+@lilypond[fragment,quote]
 c'4
 @end lilypond
 
@@ -1697,7 +1697,7 @@ length.
 
 Options are put in brackets.
 
-@lilypond[quote,staffsize=26,verbatim]
+@lilypond[fragment,quote,staffsize=26,verbatim]
 c'4 f16
 @end lilypond
 

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 601bf34d7e3f9570d14e5afff20a7b08f5319067..65e846384ceb5817eeb2c9e2f89897f580f39d3f 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-16 17:53+0200\n"
+"POT-Creation-Date: 2004-07-17 12:18+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"
@@ -143,6 +143,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 ""
@@ -738,6 +740,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'"
@@ -886,6 +889,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 ""
@@ -1235,6 +1244,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..."
@@ -1356,6 +1366,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 ""
@@ -1556,6 +1569,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"
@@ -1586,6 +1600,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 ""
@@ -1605,16 +1621,16 @@ msgstr ""
 msgid "#<spring smob d= %f>"
 msgstr ""
 
-#: stem.cc:119 lily/stem.cc:114
+#: stem.cc:119 lily/stem.cc:114 lily/stem.cc:126
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
-#: stem.cc:648 lily/stem.cc:577
+#: stem.cc:648 lily/stem.cc:577 lily/stem.cc:589
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:661 lily/stem.cc:588
+#: stem.cc:661 lily/stem.cc:588 lily/stem.cc:600
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
@@ -1679,6 +1695,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)"
@@ -1713,6 +1731,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"
@@ -1758,6 +1778,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."
@@ -1957,7 +1982,8 @@ msgstr ""
 msgid "Use help as  SYMBOL to get online help."
 msgstr ""
 
-#: lily/scm-option.cc:133 lily/scm-option.cc:161
+#: lily/scm-option.cc:133 lily/scm-option.cc:161 lily/scm-option.cc:136
+#: lily/scm-option.cc:164
 #, c-format
 msgid "No such internal option: %s"
 msgstr ""