From 7faec0b5e9d15416f9e6e83297624b37252c970f Mon Sep 17 00:00:00 2001 From: gpercival Date: Mon, 16 Jun 2003 16:05:04 +0000 Subject: [PATCH] Added raggedright, removed two old input/test files. --- ChangeLog | 3 +++ input/test/add-staccato.ly | 1 + input/test/add-text-script.ly | 1 + input/test/ancient-accidentals.ly | 1 - input/test/ancient-font.ly | 2 ++ input/test/ancient-time.ly | 1 + input/test/bar-always.ly | 1 + input/test/bar-lines-lyric-only.ly | 1 + input/test/bar-lines.ly | 1 + input/test/bar-number-every-five-reset.ly | 1 + input/test/bar-number-show-all.ly | 1 + input/test/beam-auto-4-8.ly | 1 + input/test/beam-auto-override.ly | 1 + input/test/beam-control.ly | 1 + input/test/beam-count.ly | 2 +- input/test/beam-damp.ly | 4 +-- input/test/beam-dir-functions.ly | 1 + input/test/beam-neutral-direction.ly | 2 +- input/test/blank-notes.ly | 4 ++- input/test/boxed-molecule.ly | 4 ++- input/test/cautionaries.ly | 1 + input/test/chord-markup.ly | 1 + input/test/chords-without-melody.ly | 1 + input/test/coda-kludge.ly | 1 + input/test/count-systems.ly | 1 + input/test/crescendi.ly | 1 + input/test/cue-notes.ly | 2 +- input/test/drarn-slurs.ly | 2 +- input/test/drarn.ly | 3 ++- input/test/duration-check.ly | 1 + input/test/dynamic-absolute-volume.ly | 3 +-- input/test/dynamic-extra.ly | 1 + input/test/embedded-postscript.ly | 3 ++- input/test/embedded-scm.ly | 1 + input/test/embedded-tex.ly | 2 +- input/test/explicit.ly | 1 + input/test/fake-grace.ly | 26 -------------------- input/test/figured-bass.ly | 30 ----------------------- input/test/fill-a4.ly | 5 ++-- input/test/follow-break.ly | 1 + input/test/follow-thread.ly | 2 +- 41 files changed, 50 insertions(+), 73 deletions(-) delete mode 100644 input/test/fake-grace.ly delete mode 100644 input/test/figured-bass.ly diff --git a/ChangeLog b/ChangeLog index 0805be777d..560fce5792 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * input/test/g*: added texidoc index. + * input/test/[a-g]*: added raggedright==#t when it + seemed appropiate. + 2003-06-16 Han-Wen Nienhuys * input/test/spanner-after-break-tweak.ly (texidoc): new file. diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index 0763a324c5..0809d44bfd 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -35,6 +35,7 @@ one would not use scm constructs. See separate-staccato.ly first. a b \apply #add-staccato { c c } a b \apply #add-staccato { c c } } + \paper{ raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index a9c6639c78..14afb59786 100644 --- a/input/test/add-text-script.ly +++ b/input/test/add-text-script.ly @@ -30,6 +30,7 @@ create, then write a function that will build the structure for you. \score { \apply #(lambda (x) (add-text-script x "6") (display x) x ) \notes { c4-3 } + \paper{ raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index 9f1456469b..474d153060 100644 --- a/input/test/ancient-accidentals.ly +++ b/input/test/ancient-accidentals.ly @@ -50,6 +50,5 @@ file lists all of them. ceses ceses! ceses? | } - \paper { } } %% new-chords-done %% diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index e23156e7d8..dbae323c52 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -220,8 +220,10 @@ lowerStaff = \context MensuralStaff = lowerStaff < \lowerStaff > \paper { +% do we want to keep these settings? -gp linewidth = 17.25\cm textheight = 26.0\cm + stafflinethickness = \staffspace / 5.0 indent = 0.0 \translator { diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly index f239973c01..36aa0b9e24 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -12,5 +12,6 @@ Should use old style. \property Staff.TimeSignature \override #'style = #'neo_mensural s1 } + \paper {raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly index c514800d08..e80da0daa4 100644 --- a/input/test/bar-always.ly +++ b/input/test/bar-always.ly @@ -12,5 +12,6 @@ automatically insert barlines everywhere. \property Score.barAlways = ##t \property Score.defaultBarType = ":|:" c4 c4 c4 c4 } + \paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index a501547564..a664af407e 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -21,6 +21,7 @@ Span_bar_engraver if you want bar lines on lyrics. \paper { + raggedright = ##t \translator { \LyricsVoiceContext \consists Bar_engraver diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index c917ef06a5..df79d92e66 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -16,5 +16,6 @@ c4 \bar ".|." c \bar "|" c } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly index 28d7f57131..fdb10ab62e 100644 --- a/input/test/bar-number-every-five-reset.ly +++ b/input/test/bar-number-every-five-reset.ly @@ -25,4 +25,5 @@ resetBarnum = \context Score \applycontext \bar "|." } > +\paper{raggedright = ##t} } diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly index f88fec286f..53a176445d 100644 --- a/input/test/bar-number-show-all.ly +++ b/input/test/bar-number-show-all.ly @@ -12,6 +12,7 @@ Second line has bar numbers on start of every measure. \break c c c } + \paper{ raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly index e0c4eac549..86b50e1bcc 100644 --- a/input/test/beam-auto-4-8.ly +++ b/input/test/beam-auto-4-8.ly @@ -29,6 +29,7 @@ You can override Lilypond's automatic beaming. c8 c c c16 c } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly index e42c9b494d..a339a414ef 100644 --- a/input/test/beam-auto-override.ly +++ b/input/test/beam-auto-override.ly @@ -45,6 +45,7 @@ The beam will be ended also when now % beamAutoEnd = 0 autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 2) } } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly index 3247dc4cee..13e7388147 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -19,5 +19,6 @@ Controlling beam positions. \property Voice.Beam \revert #'positions c-[ e] e-[ c] } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly index b6348d54e4..c23e849aab 100644 --- a/input/test/beam-count.ly +++ b/input/test/beam-count.ly @@ -22,6 +22,6 @@ fragment = \notes { \score { \notes\relative c \fragment - \paper { } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly index 96f012af95..26ae68082c 100644 --- a/input/test/beam-damp.ly +++ b/input/test/beam-damp.ly @@ -2,9 +2,9 @@ % this example doesn't look very useful. Perhaps remove it in % the future, although it _does_ demonstrate a neat feature of % lilypond. Maybe regression? Or a "neat features" page -% (one of the intro pages, maybe?) +% (one of the intro pages, maybe?) -gp % OTOH, this is probably a basic lesson for engraving music, -% so it might not be worth advertising it. :) +% so it might not be worth advertising it. :) -gp texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly index cf1cdde6e8..26445f0e3b 100644 --- a/input/test/beam-dir-functions.ly +++ b/input/test/beam-dir-functions.ly @@ -38,6 +38,7 @@ your favourite algorithm isn't one of these, you can hook up your own. \property Voice.Beam \set #'dir-function = #beam-dir-median [c c g] } +\paper{raggedright = ##t} } %% Local variables: diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly index e1bfdc5012..ae6bdc570b 100644 --- a/input/test/beam-neutral-direction.ly +++ b/input/test/beam-neutral-direction.ly @@ -18,6 +18,6 @@ fragment = \notes { \score { \notes\relative c \fragment - \paper { } + \paper {raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly index 981ae7329d..15a92a5fa8 100644 --- a/input/test/blank-notes.ly +++ b/input/test/blank-notes.ly @@ -26,6 +26,8 @@ unblanknotes = { \property Voice.NoteHead \notes { c4 d4 \blanknotes e4 f4 \unblanknotes g4 a - }} + } +\paper{raggedright = ##t} +} %% new-chords-done %% diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly index 283cd653c7..308cadf8cd 100644 --- a/input/test/boxed-molecule.ly +++ b/input/test/boxed-molecule.ly @@ -26,5 +26,7 @@ TODO: circled molecules. \property Voice.Stem \revert #'molecule-callback c4. c4 \mark "F" c1 - }} + } +\paper{raggedright = ##t} +} %% new-chords-done %% diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 4a481080d9..0cba11ddc5 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -14,6 +14,7 @@ Lilypond can display cautionary accidentals in different ways. <>1 cis?2 d? } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/chord-markup.ly b/input/test/chord-markup.ly index 2bd43dc42d..e0ad3ab3f1 100644 --- a/input/test/chord-markup.ly +++ b/input/test/chord-markup.ly @@ -19,5 +19,6 @@ chord/markup test. \column << "1" { \bold "2" "3" } >> } } > +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly index b59ad01eeb..30123059a5 100644 --- a/input/test/chords-without-melody.ly +++ b/input/test/chords-without-melody.ly @@ -23,6 +23,7 @@ texidoc = "Jazz chords can also be used without notes." \consists Bar_engraver \consists "Volta_engraver" } + raggedright = ##t } } diff --git a/input/test/coda-kludge.ly b/input/test/coda-kludge.ly index 1cc1627b3a..df25d3525b 100644 --- a/input/test/coda-kludge.ly +++ b/input/test/coda-kludge.ly @@ -54,6 +54,7 @@ Hi, five1 } > +\paper{raggedright = ##t} } diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index 16f08a31a7..ab4fc82b5f 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -34,6 +34,7 @@ specified number of lines. } \paper{ indent = 0.0\mm linewidth = 10.0\mm + raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly index 4ec8f16c93..ab8ee81b2f 100644 --- a/input/test/crescendi.ly +++ b/input/test/crescendi.ly @@ -13,6 +13,7 @@ a-\mf\< a \!a a\< \!a } \paper{ +raggedright = ##t } \midi{ \tempo 1 = 60 diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly index 0f46cb31f9..7f94613aa5 100644 --- a/input/test/cue-notes.ly +++ b/input/test/cue-notes.ly @@ -33,7 +33,7 @@ usually not restored explicitly. r8^"Bsn." c'8 f'8-[ f'8] % FIXME: check to see if clef should be cancelled from the cue. IIRC -% it should be, but I could be wrong. +% it should be, but I could be wrong. -gp % \property Staff.fontSize\unset % \property Staff . Clef = \turnOff \clef treble diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly index 05593e89b7..3729530b8a 100644 --- a/input/test/drarn-slurs.ly +++ b/input/test/drarn-slurs.ly @@ -17,6 +17,6 @@ fragment = \notes { \score { \notes\relative c \fragment - \paper { } + \paper { raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/drarn.ly b/input/test/drarn.ly index 23d1651df7..02db4fb375 100644 --- a/input/test/drarn.ly +++ b/input/test/drarn.ly @@ -21,6 +21,7 @@ You can attach slurs and ties to noteheads. a8(a-)-~a } > - \paper { linewidth = 40*\staffspace } + \paper { linewidth = 40*\staffspace + raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/duration-check.ly b/input/test/duration-check.ly index ff7527ade8..60a8c0a881 100644 --- a/input/test/duration-check.ly +++ b/input/test/duration-check.ly @@ -52,5 +52,6 @@ bug. " a b8 c16 d a2 r } > +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly index b52259701a..22324fa3aa 100644 --- a/input/test/dynamic-absolute-volume.ly +++ b/input/test/dynamic-absolute-volume.ly @@ -19,8 +19,7 @@ a-\ff a\fff a\sf } -\paper{ -} +\paper{ raggedright = ##t } \midi{ \tempo 1 = 60 } diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly index 141e2ddda0..fa88957e9a 100644 --- a/input/test/dynamic-extra.ly +++ b/input/test/dynamic-extra.ly @@ -14,6 +14,7 @@ piuf = \markup { \italic "pi\\`u" \dynamic "f" } c2\< \! c2 } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index d63e66c25d..c68128305b 100644 --- a/input/test/embedded-postscript.ly +++ b/input/test/embedded-postscript.ly @@ -16,6 +16,7 @@ TODO: make molecule-callback to do this. s2 a'1 } - \paper { linewidth = 70 * \staffspace } + \paper { linewidth = 70 * \staffspace + raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly index ab3198cae4..d3b119ca6b 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -6,6 +6,7 @@ You can embed scm functions in your scores. #(begin (newline)(display "hello world")(newline))\score{ \notes\relative c'{ c } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly index 077de6da80..d926731b6a 100644 --- a/input/test/embedded-tex.ly +++ b/input/test/embedded-tex.ly @@ -10,6 +10,6 @@ fragment = \notes { \score { \notes\relative c \fragment - \paper { } + \paper { raggedright = ##t } } %% new-chords-done %% diff --git a/input/test/explicit.ly b/input/test/explicit.ly index ed5de5c240..98a60ecf41 100644 --- a/input/test/explicit.ly +++ b/input/test/explicit.ly @@ -9,5 +9,6 @@ Explicit pitches and durations. " \pitch #(ly:make-pitch 1 1 1) \duration #(ly:make-duration 2 0) } +\paper{raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/fake-grace.ly b/input/test/fake-grace.ly deleted file mode 100644 index de89e894ed..0000000000 --- a/input/test/fake-grace.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "1.7.18" -% possible rename to grace-fake.ly -gp -\header{ texidoc="@cindex Grace Fake -If desired, you can fake a grace note. by changing the timing and fontsize -instead of using \grace. " } -% although I don't know why you'd want to. - -\score { - \context Voice \notes\relative c { - % to see the magic: uncomment size stuff in init/paper20.ly - - c'4 c4 - - \property Voice.fontSize= #-2 - b16*1/2 ( - \property Voice.fontSize= #0 - - ) g4 *31/32 - - a a g2 - - } - \paper { } - \midi { } -} -%% new-chords-done %% diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly deleted file mode 100644 index 9f2ebbd51b..0000000000 --- a/input/test/figured-bass.ly +++ /dev/null @@ -1,30 +0,0 @@ -\version "1.7.18" -\header { -texidoc = "@cindex Figured Bass -%Test figured bass. - -Figured bass is created by the FiguredBass context which eats -note-requests and rest-requests. You can enter these either using -standard @code{<< >>} notation, or using the special @code{\figures @{ @}} -mode, which allows you to type numbers, like @code{<<4 6+>>}. " } - -\score { \notes < -\context FiguredBass \transpose c c' { - <> - <>8 - \figures { - r8 - <1 3 5>4 <3- 5+ 6!> <5> - } - } - \context Voice { - c - g8 g - f4 - d - c - } - -> - } -%% new-chords-done %% diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index 919a8645b3..0230e6e8c0 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -1,7 +1,8 @@ \version "1.7.18" %possible rename to paper-fill-a4.ly -gp -% candidate for regression -gp - +% candidate for reg -gp +% Han says no, but keeping this comment temporarily so that I don't +% forget and nominate it for reg again. :) -gp % test file to get a4 paper really filled, % without having to resort to the ever-ugly oversizing hack: diff --git a/input/test/follow-break.ly b/input/test/follow-break.ly index ea3bc685a1..77e41e7195 100644 --- a/input/test/follow-break.ly +++ b/input/test/follow-break.ly @@ -17,6 +17,7 @@ followVoice: connect note heads with line when thread switches staff. \context Staff=two { \clef bass \skip 1*2 } > \paper{ + raggedright = ##t linewidth = 70.\mm \translator { \ScoreContext diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly index d11255194b..a049534f50 100644 --- a/input/test/follow-thread.ly +++ b/input/test/follow-thread.ly @@ -23,6 +23,6 @@ fragment = \notes { \score { \notes\relative c \fragment - \paper { } + \paper { raggedright = ##t } } %% new-chords-done %% -- 2.39.5