* scripts/lilypond-book.py (check_texidoc): add no-texidoc to options

* Documentation/user/appendices.itely: simply include
chords-ignatzek.

* Documentation/user/refman.itely (Chords mode): add documentation
for chord mode.

diff --git a/ChangeLog b/ChangeLog
index 1da833617911307f2496a541725174375faefed4..f79881fb2038e2f921e392a5a01697097a6718ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-02-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scripts/lilypond-book.py (check_texidoc): add no-texidoc to options
+
        * lily/new-chord-name-engraver.cc (process_music): give original
        inversion pitch to chord name routine.
 

diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely
index 06f5c7486fd52125c5d18760a0c471338d8a14cd..c151df2cc313c98b978b5f8844eb35de10891e6d 100644 (file)
--- a/Documentation/user/appendices.itely
+++ b/Documentation/user/appendices.itely
@@ -42,7 +42,7 @@ rules.
 @node Jazz chords
 @section Jazz chords
 
-@lilypondfile{chords-ignatzek.ly}
+@lilypondfile[notexidoc]{chords-ignatzek.ly}
 
 @node MIDI instruments
 @section MIDI instruments

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index c9a4eac6cb6a891f46831f403d552be6eb946a72..cd3cd356a221fe2f5894e896e33fd35f8c45f11e 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -310,6 +310,9 @@ use no indentation.
 Set indentation of the first music system to zero.  This option
 affects LilyPond, not the text layout.
 
+@item notexidoc
+Do not include the .texidoc header. This is only for Texinfo output.
+
 @item noquote
 By default, @command{lilypond-book} puts both La@TeX{} and texinfo output
 into a quotation block.  Using this option prevents this; no indentation

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index fed1fb0911c141c7a5f2f28e41d6b7eb038c862f..9ae15291a7880bc6d1268a7ae7c0877ca43d6eb5 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3516,6 +3516,8 @@ Klaus Ignatzek (See @ref{Literature}).
 
 [TODO: add description for banter other jazz.]
 
+[TODO: describe tweak options, chordNameFunction,chordNameExceptions,
+majorSevenSymbol, chordNameSeparator]
 
 @node Writing parts
 @section Writing parts

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 61c630972b821dd646f0851fe5dcc48eeca3efef..d65c7b3387cbba63260752c2656e32e2636c9159 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -2341,15 +2341,15 @@ The second file, @file{input/tutorial/os-score.ly}, reads the
 definitions of the first (@file{input/tutorial/os-music.ly}), and
 defines the @code{\score} block for the full conductor's score.
 
-@verbatim
+@example
 \version "1.7.6"
 
 \include "os-music.ly"
 \include "paper13.ly"
 
 #(ly:set-point-and-click 'line-column)
-textFlat = \markup {\smaller \musicglyph #"accidentals--1"}
-\score {
+textFlat = \markup @{\smaller \musicglyph #"accidentals--1"@}
+\score @{
   <
     \global
     \property Score.BarNumber \override #'padding = #3
@@ -2359,14 +2359,14 @@ textFlat = \markup {\smaller \musicglyph #"accidentals--1"}
        \property Staff.instrument = "2 Flauti"
        \property Staff.instr = "Fl."
         \Key
-       \context Voice=one { \voiceOne \flautoI }
-       \context Voice=two { \voiceTwo \flautoII }
+       \context Voice=one @{ \voiceOne \flautoI @}
+       \context Voice=two @{ \voiceTwo \flautoII @}
       >
     >
     \context StaffGroup = timpani <
       \context Staff = timpani <
        \property Staff.midiInstrument = #"timpani"
-       \property Staff.instrument = \markup { \column <<  "Timpani" "(C-G)" >> }
+       \property Staff.instrument = \markup @{ \column <<  "Timpani" "(C-G)" >> @}
        \property Staff.instr = #"Timp."
        \clef bass
         \Key
@@ -2376,8 +2376,8 @@ textFlat = \markup {\smaller \musicglyph #"accidentals--1"}
     \context StaffGroup = brass <
       \context Staff = trombe <
        \property Staff.midiInstrument = #"trumpet"
-       \property Staff.instrument = \markup { \column << "2 Trombe" "(C)" >> }
-       \property Staff.instr = \markup{ \column << "Tbe." "(C)">> }
+       \property Staff.instrument = \markup @{ \column << "2 Trombe" "(C)" >> @}
+       \property Staff.instr = \markup@{ \column << "Tbe." "(C)">> @}
         \Key
        \context Voice=one \partcombine Voice
          \context Thread=one \tromboI
@@ -2386,36 +2386,33 @@ textFlat = \markup {\smaller \musicglyph #"accidentals--1"}
       \context Staff = corni <
         \property Staff.midiInstrument = #"french horn"
        \property Staff.instrument
-       = \markup { \column << "Corno" { "(E"  \textFlat ")" } >> }
+       = \markup @{ \column << "Corno" @{ "(E"  \textFlat ")" @} >> @}
        \property Staff.instr =
-       \markup { \column << "Cor." { "(E"  \textFlat ")" } >> }
+       \markup @{ \column << "Cor." @{ "(E"  \textFlat ")" @} >> @}
        \property Staff.transposing = #3
        \notes \key bes \major
        \context Voice=one \corno
       >
     >
   >
-  \paper {
+  \paper @{
     indent = 15 * \staffspace
     linewidth = 60 * \staffspace
     textheight = 90 * \staffspace
-    \translator{
+    \translator@{
       \VoiceContext
       \consists "Multi_measure_rest_engraver"
-    }
-    \translator{
+    @}
+    \translator@{
       \HaraKiriStaffContext
       \remove "Multi_measure_rest_engraver"
-    }
-  }
-  \midi {
+    @}
+  @}
+  \midi @{
     \tempo 4 = 75
-  }
-}
-
-
-
-@end verbatim
+  @}
+@}
+@end example
 
 @center @strong{Zo, goed lieverd?}
 @sp 1

diff --git a/input/test/dpncnt.ly b/input/test/dpncnt.ly
index a89dc3de82a951515c8cd87e01ba534383261eca..9840b2cd69c5320757d9a068cbca7bed65b2fce1 100644 (file)
--- a/input/test/dpncnt.ly
+++ b/input/test/dpncnt.ly
@@ -1,8 +1,12 @@
 
 \header {
-    texidoc = "test file for new-new-chord names, ie, double-plus-new-chord-name"
+    texidoc = "test file for new-new-chord names, ie, double-plus-new-chord-name
+TODO: FIXME.
+"
 }
 
+%{
+
 efull = \chordnames {
 
     %% ? what 'bout maj7?
@@ -111,3 +115,5 @@ ch = \notes \transpose c' c'
        }
     }
 }
+
+%} 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 38f4a51fd29f382ac45f2a982ef95be469b8d206..4dbafe498dd6c08e428251fcb6aa556f5ff3b123 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1202,7 +1202,8 @@ def check_texidoc (chunks):
                if c[0] == 'lilypond':
                        (type, body, opts, todo, basename) = c;
                        pathbase = os.path.join (g_outdir, basename)
-                       if os.path.isfile (pathbase + '.texidoc'):
+                       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 (c)