From 203cf22af0e025b06ef7bf8e1c5ab798d5ac1400 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Thu, 19 Mar 2009 17:34:58 +0100 Subject: [PATCH] MusicXML: Fix TOC links to unnumbered subsecs (add @nodes, but don't show menus) (cherry picked from commit 14b2c5359877e67164cad2386ee25b04403fd954) --- .../regression/musicxml/00-Introduction.itexi | 31 +++++++++++++++++++ input/regression/musicxml/01-Pitches.itexi | 1 + input/regression/musicxml/02-Rests.itexi | 1 + input/regression/musicxml/03-Rhythm.itexi | 1 + .../musicxml/11-TimeSignatures.itexi | 1 + input/regression/musicxml/12-Clefs.itexi | 1 + .../musicxml/13-KeySignatures.itexi | 2 +- input/regression/musicxml/21-Chords.itexi | 1 + .../regression/musicxml/22-NoteSettings.itexi | 1 + input/regression/musicxml/23-Tuplets.itexi | 1 + .../regression/musicxml/24-Grace-Notes.itexi | 1 + input/regression/musicxml/31-Directions.itexi | 1 + .../musicxml/32-Notations-Articulations.itexi | 1 + input/regression/musicxml/33-Spanners.itexi | 1 + .../musicxml/41-Multiple-Parts.itexi | 1 + .../musicxml/42-MultiVoice-Parts.itexi | 1 + .../musicxml/43-MultiStaff-Parts.itexi | 1 + input/regression/musicxml/45-Repeats.itexi | 1 + input/regression/musicxml/46-Measures.itexi | 1 + input/regression/musicxml/51-Header.itexi | 1 + input/regression/musicxml/52-PageLayout.itexi | 1 + input/regression/musicxml/61-Lyrics.itexi | 1 + input/regression/musicxml/71-Guitar.itexi | 1 + .../musicxml/72-TransposingInstruments.itexi | 1 + input/regression/musicxml/73-Percussion.itexi | 1 + .../regression/musicxml/74-Figured-Bass.itexi | 1 + .../musicxml/75-OtherInstruments.itexi | 1 + .../musicxml/90-Compressed-MusicXML.itexi | 1 + .../musicxml/99-Compatibility.itexi | 1 + input/regression/musicxml/GNUmakefile | 2 +- 30 files changed, 60 insertions(+), 2 deletions(-) diff --git a/input/regression/musicxml/00-Introduction.itexi b/input/regression/musicxml/00-Introduction.itexi index 475daa6832..7be82e7f06 100644 --- a/input/regression/musicxml/00-Introduction.itexi +++ b/input/regression/musicxml/00-Introduction.itexi @@ -70,3 +70,34 @@ MIDI generation don'thave any test cases yet. @node Test cases @chapter Test cases + +@menu + * 01 ... Pitches + * 02 ... Rests + * 03 ... Rhythm + * 11 ... Time signatures + * 12 ... Clefs + * 13 ... Key signatures + * 21 ... Chorded notes + * 22 ... Note settings heads etc. + * 23 ... Triplets Tuplets + * 24 ... Grace notes + * 31 ... Dynamics and other single symbols + * 32 ... Notations and Articulations + * 33 ... Spanners + * 41 ... Multiple parts (staves) + * 42 ... Multiple voices per staff + * 43 ... One part on multiple staves + * 45 ... Repeats + * 46 ... Barlines Measures + * 51 ... Header information + * 52 ... Page layout + * 61 ... Lyrics + * 71 ... Guitar notation + * 72 ... Transposing instruments + * 73 ... Percussion + * 74 ... Figured bass + * 75 ... Other instrumental notation + * 90 ... Compressed MusicXML files + * 99 ... Compatibility with broken MusicXML +@end menu \ No newline at end of file diff --git a/input/regression/musicxml/01-Pitches.itexi b/input/regression/musicxml/01-Pitches.itexi index 0bb62574d1..0b4bfc6e13 100644 --- a/input/regression/musicxml/01-Pitches.itexi +++ b/input/regression/musicxml/01-Pitches.itexi @@ -1 +1,2 @@ +@node 01 ... Pitches @unnumberedsec 01 ... Pitches diff --git a/input/regression/musicxml/02-Rests.itexi b/input/regression/musicxml/02-Rests.itexi index ba92d1ebc9..d04c3a0b91 100644 --- a/input/regression/musicxml/02-Rests.itexi +++ b/input/regression/musicxml/02-Rests.itexi @@ -1 +1,2 @@ +@node 02 ... Rests @unnumberedsec 02 ... Rests diff --git a/input/regression/musicxml/03-Rhythm.itexi b/input/regression/musicxml/03-Rhythm.itexi index 8a5afb2b32..10c4b7b2eb 100644 --- a/input/regression/musicxml/03-Rhythm.itexi +++ b/input/regression/musicxml/03-Rhythm.itexi @@ -1 +1,2 @@ +@node 03 ... Rhythm @unnumberedsec 03 ... Rhythm diff --git a/input/regression/musicxml/11-TimeSignatures.itexi b/input/regression/musicxml/11-TimeSignatures.itexi index 06d868461d..6dc302065e 100644 --- a/input/regression/musicxml/11-TimeSignatures.itexi +++ b/input/regression/musicxml/11-TimeSignatures.itexi @@ -1 +1,2 @@ +@node 11 ... Time signatures @unnumberedsec 11 ... Time signatures diff --git a/input/regression/musicxml/12-Clefs.itexi b/input/regression/musicxml/12-Clefs.itexi index 2adf8b5697..1b695c3bdb 100644 --- a/input/regression/musicxml/12-Clefs.itexi +++ b/input/regression/musicxml/12-Clefs.itexi @@ -1 +1,2 @@ +@node 12 ... Clefs @unnumberedsec 12 ... Clefs diff --git a/input/regression/musicxml/13-KeySignatures.itexi b/input/regression/musicxml/13-KeySignatures.itexi index 944ac6eb55..26831302fa 100644 --- a/input/regression/musicxml/13-KeySignatures.itexi +++ b/input/regression/musicxml/13-KeySignatures.itexi @@ -1,2 +1,2 @@ +@node 13 ... Key signatures @unnumberedsec 13 ... Key signatures - diff --git a/input/regression/musicxml/21-Chords.itexi b/input/regression/musicxml/21-Chords.itexi index 75e68bf1cd..286d81c0a6 100644 --- a/input/regression/musicxml/21-Chords.itexi +++ b/input/regression/musicxml/21-Chords.itexi @@ -1 +1,2 @@ +@node 21 ... Chorded notes @unnumberedsec 21 ... Chorded notes diff --git a/input/regression/musicxml/22-NoteSettings.itexi b/input/regression/musicxml/22-NoteSettings.itexi index 735b7c0345..9a956d6b2a 100644 --- a/input/regression/musicxml/22-NoteSettings.itexi +++ b/input/regression/musicxml/22-NoteSettings.itexi @@ -1 +1,2 @@ +@node 22 ... Note settings heads etc. @unnumberedsec 22 ... Note settings, heads, etc. diff --git a/input/regression/musicxml/23-Tuplets.itexi b/input/regression/musicxml/23-Tuplets.itexi index edc50328db..793eab06a4 100644 --- a/input/regression/musicxml/23-Tuplets.itexi +++ b/input/regression/musicxml/23-Tuplets.itexi @@ -1 +1,2 @@ +@node 23 ... Triplets Tuplets @unnumberedsec 23 ... Triplets, Tuplets diff --git a/input/regression/musicxml/24-Grace-Notes.itexi b/input/regression/musicxml/24-Grace-Notes.itexi index 68b171e7dd..0c9cb8f0f9 100644 --- a/input/regression/musicxml/24-Grace-Notes.itexi +++ b/input/regression/musicxml/24-Grace-Notes.itexi @@ -1 +1,2 @@ +@node 24 ... Grace notes @unnumberedsec 24 ... Grace notes diff --git a/input/regression/musicxml/31-Directions.itexi b/input/regression/musicxml/31-Directions.itexi index 527c92465f..630e3559a3 100644 --- a/input/regression/musicxml/31-Directions.itexi +++ b/input/regression/musicxml/31-Directions.itexi @@ -1 +1,2 @@ +@node 31 ... Dynamics and other single symbols @unnumberedsec 31 ... Dynamics and other single symbols diff --git a/input/regression/musicxml/32-Notations-Articulations.itexi b/input/regression/musicxml/32-Notations-Articulations.itexi index c76b329f09..24b44c056b 100644 --- a/input/regression/musicxml/32-Notations-Articulations.itexi +++ b/input/regression/musicxml/32-Notations-Articulations.itexi @@ -1 +1,2 @@ +@node 32 ... Notations and Articulations @unnumberedsec 32 ... Notations and Articulations diff --git a/input/regression/musicxml/33-Spanners.itexi b/input/regression/musicxml/33-Spanners.itexi index b4d4f7a149..91547ba2b0 100644 --- a/input/regression/musicxml/33-Spanners.itexi +++ b/input/regression/musicxml/33-Spanners.itexi @@ -1 +1,2 @@ +@node 33 ... Spanners @unnumberedsec 33 ... Spanners diff --git a/input/regression/musicxml/41-Multiple-Parts.itexi b/input/regression/musicxml/41-Multiple-Parts.itexi index 2f065733fb..6026903e65 100644 --- a/input/regression/musicxml/41-Multiple-Parts.itexi +++ b/input/regression/musicxml/41-Multiple-Parts.itexi @@ -1 +1,2 @@ +@node 41 ... Multiple parts (staves) @unnumberedsec 41 ... Multiple parts (staves) diff --git a/input/regression/musicxml/42-MultiVoice-Parts.itexi b/input/regression/musicxml/42-MultiVoice-Parts.itexi index c8d15fdff6..2353193b3a 100644 --- a/input/regression/musicxml/42-MultiVoice-Parts.itexi +++ b/input/regression/musicxml/42-MultiVoice-Parts.itexi @@ -1 +1,2 @@ +@node 42 ... Multiple voices per staff @unnumberedsec 42 ... Multiple voices per staff diff --git a/input/regression/musicxml/43-MultiStaff-Parts.itexi b/input/regression/musicxml/43-MultiStaff-Parts.itexi index c65b084dac..562709b669 100644 --- a/input/regression/musicxml/43-MultiStaff-Parts.itexi +++ b/input/regression/musicxml/43-MultiStaff-Parts.itexi @@ -1 +1,2 @@ +@node 43 ... One part on multiple staves @unnumberedsec 43 ... One part on multiple staves diff --git a/input/regression/musicxml/45-Repeats.itexi b/input/regression/musicxml/45-Repeats.itexi index 89516fb22e..7e475d0f81 100644 --- a/input/regression/musicxml/45-Repeats.itexi +++ b/input/regression/musicxml/45-Repeats.itexi @@ -1 +1,2 @@ +@node 45 ... Repeats @unnumberedsec 45 ... Repeats diff --git a/input/regression/musicxml/46-Measures.itexi b/input/regression/musicxml/46-Measures.itexi index 92ebde3f99..e6c93d8d33 100644 --- a/input/regression/musicxml/46-Measures.itexi +++ b/input/regression/musicxml/46-Measures.itexi @@ -1 +1,2 @@ +@node 46 ... Barlines Measures @unnumberedsec 46 ... Barlines, Measures diff --git a/input/regression/musicxml/51-Header.itexi b/input/regression/musicxml/51-Header.itexi index 34c21cb6d2..b47ca9ea6f 100644 --- a/input/regression/musicxml/51-Header.itexi +++ b/input/regression/musicxml/51-Header.itexi @@ -1 +1,2 @@ +@node 51 ... Header information @unnumberedsec 51 ... Header information diff --git a/input/regression/musicxml/52-PageLayout.itexi b/input/regression/musicxml/52-PageLayout.itexi index 478b06b2b2..c61f557bbb 100644 --- a/input/regression/musicxml/52-PageLayout.itexi +++ b/input/regression/musicxml/52-PageLayout.itexi @@ -1 +1,2 @@ +@node 52 ... Page layout @unnumberedsec 52 ... Page layout diff --git a/input/regression/musicxml/61-Lyrics.itexi b/input/regression/musicxml/61-Lyrics.itexi index e533f66bcb..e56787e4af 100644 --- a/input/regression/musicxml/61-Lyrics.itexi +++ b/input/regression/musicxml/61-Lyrics.itexi @@ -1 +1,2 @@ +@node 61 ... Lyrics @unnumberedsec 61 ... Lyrics diff --git a/input/regression/musicxml/71-Guitar.itexi b/input/regression/musicxml/71-Guitar.itexi index 6d9bb50ab3..cdc9572f7c 100644 --- a/input/regression/musicxml/71-Guitar.itexi +++ b/input/regression/musicxml/71-Guitar.itexi @@ -1 +1,2 @@ +@node 71 ... Guitar notation @unnumberedsec 71 ... Guitar notation diff --git a/input/regression/musicxml/72-TransposingInstruments.itexi b/input/regression/musicxml/72-TransposingInstruments.itexi index 8c1e1928a7..026b7d759f 100644 --- a/input/regression/musicxml/72-TransposingInstruments.itexi +++ b/input/regression/musicxml/72-TransposingInstruments.itexi @@ -1 +1,2 @@ +@node 72 ... Transposing instruments @unnumberedsec 72 ... Transposing instruments diff --git a/input/regression/musicxml/73-Percussion.itexi b/input/regression/musicxml/73-Percussion.itexi index ed74f26066..51ec271bc4 100644 --- a/input/regression/musicxml/73-Percussion.itexi +++ b/input/regression/musicxml/73-Percussion.itexi @@ -1 +1,2 @@ +@node 73 ... Percussion @unnumberedsec 73 ... Percussion diff --git a/input/regression/musicxml/74-Figured-Bass.itexi b/input/regression/musicxml/74-Figured-Bass.itexi index 73e8be1015..29b91ce52e 100644 --- a/input/regression/musicxml/74-Figured-Bass.itexi +++ b/input/regression/musicxml/74-Figured-Bass.itexi @@ -1 +1,2 @@ +@node 74 ... Figured bass @unnumberedsec 74 ... Figured bass diff --git a/input/regression/musicxml/75-OtherInstruments.itexi b/input/regression/musicxml/75-OtherInstruments.itexi index 60b095d84d..7485842793 100644 --- a/input/regression/musicxml/75-OtherInstruments.itexi +++ b/input/regression/musicxml/75-OtherInstruments.itexi @@ -1 +1,2 @@ +@node 75 ... Other instrumental notation @unnumberedsec 75 ... Other instrumental notation diff --git a/input/regression/musicxml/90-Compressed-MusicXML.itexi b/input/regression/musicxml/90-Compressed-MusicXML.itexi index 5f2cfc41dd..1e6be88940 100644 --- a/input/regression/musicxml/90-Compressed-MusicXML.itexi +++ b/input/regression/musicxml/90-Compressed-MusicXML.itexi @@ -1 +1,2 @@ +@node 90 ... Compressed MusicXML files @unnumberedsec 90 ... Compressed MusicXML files diff --git a/input/regression/musicxml/99-Compatibility.itexi b/input/regression/musicxml/99-Compatibility.itexi index 86f5917152..82dd69d06d 100644 --- a/input/regression/musicxml/99-Compatibility.itexi +++ b/input/regression/musicxml/99-Compatibility.itexi @@ -1 +1,2 @@ +@node 99 ... Compatibility with broken MusicXML @unnumberedsec 99 ... Compatibility with broken MusicXML diff --git a/input/regression/musicxml/GNUmakefile b/input/regression/musicxml/GNUmakefile index bc0f6b519d..888616e7e7 100644 --- a/input/regression/musicxml/GNUmakefile +++ b/input/regression/musicxml/GNUmakefile @@ -3,7 +3,7 @@ depth = ../../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc musicxml - +TEXI2HTML_FLAGS += --nomenu # Urgh, how can I do two replacements at once without messing up the order of the list? TMP = $(sort $(MUSICXML_FILES) $(MUSICMXL_FILES) $(TEXINFO_SOURCES) ) -- 2.39.2