(do_file): put texidoc before image.

diff --git a/ChangeLog b/ChangeLog
index aa22948c936c07493582a2be4bcdafa485b97577..ffcf4945348b5f943beee602eca867757074c05f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-07-04  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 5044b902b705fafda37d7bceee0aaa4a42a7421a..6c3deb9296febb8598d6f003663530faed3b858c 100644 (file)
--- 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 bf477edb502d95d2cde759c97b5cf2a8e0fd8db1..c1056fd4dcbd57971b485ed502ced7dbf2a338f4 100644 (file)
--- 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 ec048213460a163e953e2651e468e85d4526a039..24077f83817873cd95120eda5301081d79b0b09f 100644 (file)
--- 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 5aca60dc04755cd414f6f76d4fb631ce87dc9e70..eb7a36ef27ec2e42095671f838ab12f0747374b5 100644 (file)
--- 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 e1db125095211c49f32b37ec63563aaeda2b04b9..3619666123b7dda63464a4c8cfe14a8d64323649 100644 (file)
--- 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 68f694d1013b70602602668ae04981ab1b4feaf9..1851e55bc8222f5835b0cc7d0542261168f9f8f3 100644 (file)
--- 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 30c9df70dac08c53677ccf801cedebebdf1fc691..453454f4fb9742c1bedd74df07f66c7bd7d7b15b 100644 (file)
--- 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 6cc2818faadf8e06643731e80d4d8a343a3860df..8d2937ce213bb494b412fa31b736201e46d2f073 100644 (file)
--- 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 63cb0b59d721a14c2d581fe9a6a7646556514c33..d989b6c368901c41c07e7dcee427524bba790fb1 100644 (file)
--- 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 bf2d6dda9bc064522265f328f69a892414fcf053..6bea3c83069a48c06ad081a16c812e17247e6cce 100644 (file)
--- 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 7559ed7e2cbac44a774c9ec85681ff9bb47e5fa6..4acfd1f5e61943a956347df23a09c9cbac37df30 100644 (file)
--- 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 fa1c65f8bc609fd055163ea93c609a483ff42854..974acec3891e9942c9f47665f523ddcaca992685 100644 (file)
--- 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)