From c0fff3e256f811ee9dda2b5643dd60b4b35c8052 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 4 Jul 2003 13:33:44 +0000 Subject: [PATCH] (do_file): put texidoc before image. --- ChangeLog | 4 ++++ input/regression/bar-scripts.ly | 4 ++-- input/regression/beam-over-barline.ly | 2 +- input/regression/beaming-ternary-metrum.ly | 2 +- input/regression/between-systems.ly | 7 +++++-- input/regression/grace-end.ly | 2 +- input/regression/grace-staff-length.ly | 2 +- input/regression/grace-sync.ly | 2 +- input/regression/multi-measure-rest-text.ly | 5 ++++- input/regression/non-empty-text.ly | 2 +- input/regression/note-group-bracket.ly | 2 +- input/regression/script-stack-order.ly | 2 +- scripts/lilypond-book.py | 7 +++---- 13 files changed, 26 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa22948c93..ffcf494534 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-07-04 Han-Wen Nienhuys + * scripts/lilypond-book.py (do_file): put texidoc before image. + + * input/regression/*.ly: fix snippet octaves + * input/test/spanner-after-break-tweak.ly: import broken-spanner-adjustment diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 5044b902b7..6c3deb9296 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -13,13 +13,13 @@ knowing it. Consequently, they fall over often. % FIXME including this file makes lily crash lateron -- breaks website build -onestaff = \context Staff = foo\notes { +onestaff = \context Staff = foo\notes\relative c'' { \property Staff.instr = instr \property Staff.instrument = instrument \mark "B" c1 \mark "A" \break c2 c2 \break } -grstaff = \notes \context GrandStaff < +grstaff = \notes \relative c'' \context GrandStaff < \context Staff = bar { \property Staff.instr = instr diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index bf477edb50..c1056fd4dc 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -3,5 +3,5 @@ texidoc = "explicit beams may cross barlines. " } \score { -\notes \context Voice { c2. c8-[ c8 c8 c8] } +\notes \relative c'' { c2. c8-[ c8 c8 c8] } } diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index ec04821346..24077f8381 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -4,7 +4,7 @@ texidoc = "automatic beaming also works in ternary time sigs." } \score { - \notes \context Staff { + \notes \relative c'' { \time 6/8 c8.-[ c16 c16 c16] } diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index 5aca60dc04..eb7a36ef27 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -3,14 +3,17 @@ \header{ texidoc=" By inserting @TeX{} commands between systems, you can force pagebreaks. + +In reality, you'd use the LateX command @code{\\newpage} instead of (pagebreak) +of course. " } -% In reality, you'd use #"\\newpage" instead of "(pagebreak)", of course. +% \score { -\notes { c1 +\notes \relative c' { c1 \context Score \outputproperty #(make-type-checker 'paper-column-interface) #'between-system-string = #"(pagebreak)\n\n" diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index e1db125095..3619666123 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -8,7 +8,7 @@ } \score { - \context Voice \notes\relative c { + \context Voice \notes\relative c' { c4 \grace { d16-[ d16] } diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index 68f694d101..1851e55bc8 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -3,7 +3,7 @@ texidoc = "Stripped version of trip.ly. Staffs should be of correct length." } \score{ - \context PianoStaff \notes < + \context PianoStaff \notes \relative c'' < \context Staff = treble { r1 r1 diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index 30c9df70da..453454f4fb 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -3,7 +3,7 @@ texidoc = "grace notes in different voices/staves are synchronized." } -\score {\notes < \context Staff { c2 +\score {\notes\relative c'' < \context Staff { c2 \grace c8 c4 c4 } \context Staff = SB { c2 \clef bass diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 6cc2818faa..8d2937ce21 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,10 +1,13 @@ \version "1.7.23" \header { + texidoc = " Texts may be added to the multi measure rests. + " + } \score { \notes { @@ -15,5 +18,5 @@ Texts may be added to the multi measure rests. R2.^"4" R2.*3_\markup { \roman "a1b2c3" } R2.*10^"inner"^"top"_"inner"_"bot" - c2. + c'2. }} diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 63cb0b59d7..d989b6c368 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -8,7 +8,7 @@ TextScript.no-spacing-rods is used to control the horizontal size of text. } \score{ - \notes{ + \notes\relative c''{ %% \emptyText %% short for \property Voice.TextScript \set #'no-spacing-rods = ##t c2_"very wide and long text" c | \break diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index bf2d6dda9b..6bea3c8306 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -17,7 +17,7 @@ brackets for analysis start and end. \score { - \notes + \notes\relative c'' { c4-\startGroup-\startGroup-\startGroup c4-\stopGroup diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 7559ed7e2c..4acfd1f5e6 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -6,7 +6,7 @@ order determines the order. Objects specified first are closest to the note. " } -\score{ \notes { c4^"inner up"^"outer up"_"inner down"_"outer down" } +\score{ \notes\relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" } \paper { raggedright = ##t} } diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index fa1c65f8bc..974acec389 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1432,8 +1432,7 @@ def check_texidoc (chunks): pathbase = os.path.join (g_outdir, basename) if os.path.isfile (pathbase + '.texidoc') \ and 'notexidoc' not in opts: - body = '\n@include %s.texidoc\n' % basename + body - c = (type, body, opts, todo, basename) + n.append( ('input', '\n@include %s.texidoc\n' % basename)) n.append (c) return n @@ -1489,12 +1488,12 @@ def do_file (input_filename): compile_all_files (chunks) chunks = fix_epswidth (chunks) + + chunks = format_lilypond_output_bodies (chunks) global format if format == 'texi': chunks = check_texidoc (chunks) - chunks = format_lilypond_output_bodies (chunks) - x = 0 chunks = completize_preamble (chunks) -- 2.39.5