MusicXML: Fix TOC links to unnumbered subsecs (add @nodes, but don't show menus)

(cherry picked from commit 14b2c5359877e67164cad2386ee25b04403fd954)

diff --git a/input/regression/musicxml/00-Introduction.itexi b/input/regression/musicxml/00-Introduction.itexi
index 475daa6832e61d8687db20467a09a35f8f7555c2..7be82e7f0645aa32a8e7dbe7e14826ea198dcbee 100644 (file)
--- 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 0bb62574d1e7a46e6e2051733eead094edeb9e8f..0b4bfc6e1342fddba27de1167d7d5a97bdde419c 100644 (file)
--- 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 ba92d1ebc96cfafb9391db84037d3cff7bfd7c3d..d04c3a0b91f348815b1cfb1472aa494994e453e3 100644 (file)
--- 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 8a5afb2b328e48af535b2729ad7ff38bcfb81e3f..10c4b7b2eb30bcf9644f078f6b04383fa6cdedd6 100644 (file)
--- 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 06d868461deb167d6d74ea58ced3548725c0abc2..6dc302065e319ae3424a61af7c3ce457cd216682 100644 (file)
--- 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 2adf8b5697b209964a15f6176c65ec09e315f52e..1b695c3bdb697d8ab2c2077ef5563fac568af3cc 100644 (file)
--- 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 944ac6eb55b9192a9cb0f9356bf63374b63fb564..26831302fa10011cfc46f4a259296f6575612870 100644 (file)
--- 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 75e68bf1cd35b1c1852fe49f62dd9075a2aadb16..286d81c0a6d48ba2843fb9265adc47ecb5bc1d61 100644 (file)
--- 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 735b7c03455ba16d3337b08ab57040e765b2f1af..9a956d6b2ad20e8ca63fe7e771dc7b0c32c82551 100644 (file)
--- 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 edc50328dbf9d01b2ba3c943ba99566a1835bd64..793eab06a49c9e2b465438c08059a2df2e8c93fa 100644 (file)
--- 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 68b171e7dd10d60edfc2b5d2c74a03afbabd318b..0c9cb8f0f91fa55765a9e69504954b778ecbec38 100644 (file)
--- 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 527c92465f4402b6b479a71f6ec492881d053ee9..630e3559a32445576db23bd82395af6263a26d04 100644 (file)
--- 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 c76b329f09d2580356be1aa737867e133c52bff9..24b44c056b5b780854686b62e06e10e60c6f863d 100644 (file)
--- 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 b4d4f7a149bfdc8183d120c475450ae9ec7c00d8..91547ba2b05e480f5a9f5efa4df047a73e21db8e 100644 (file)
--- 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 2f065733fb57d520a5da03b677444b86f858db5e..6026903e655c296782fe207c010525c05c3d2d64 100644 (file)
--- 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 c8d15fdff670313fc77d67c120d6b2514857defb..2353193b3a2ebf9bdc9770ae0e993264ae1a9073 100644 (file)
--- 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 c65b084dac2b96343cc8d650bb03f73afba84890..562709b669003cf2441c8a405539b8ffa0ac6380 100644 (file)
--- 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 89516fb22e8955823da3b33767e58980f5f78f6b..7e475d0f81840f6843ee68635b7185cdd4b1c394 100644 (file)
--- 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 92ebde3f999fdca42c8de3eb61728cfe4f605628..e6c93d8d337717990c691dffeee8d9d07734a468 100644 (file)
--- 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 34c21cb6d2a1e4bb74ea51d4313eea2b015c8e40..b47ca9ea6faac82076c288f2114e5c2006e7c364 100644 (file)
--- 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 478b06b2b267f4c2f0fe940ae9d6c2c1bf477816..c61f557bbb8c75f006c712514fa15b3df833481b 100644 (file)
--- 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 e533f66bcb3cce56f59a2265b66be766b7489b63..e56787e4af5060ae40f8a4bf14532dc80d78358e 100644 (file)
--- 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 6d9bb50ab36b135536f45271fce7e17cdaa540ac..cdc9572f7c8db0e5f2db19161d3b93daaa6ded8b 100644 (file)
--- 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 8c1e1928a72ee383143a599b20a6e957bc90e6cd..026b7d759f4623b9089b3be8a7594f79a0f71217 100644 (file)
--- 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 ed74f26066cce06c743bda6fae498cbd6858d9e3..51ec271bc4916d62a7b18d071843bbb0060cc082 100644 (file)
--- 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 73e8be1015b68e215780ab861f4e7610ed3e838b..29b91ce52e64fc243ec2a2fbfb1b8d04704d39fb 100644 (file)
--- 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 60b095d84deed25f1da7ab9ae61f3158c7263944..74858427933eef7bc4057893f54722349ef15624 100644 (file)
--- 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 5f2cfc41dd1438df4beb38b0d860a5681b54a82a..1e6be88940ec5185b6ed67773254a89550743707 100644 (file)
--- 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 86f59171521a8a366290564a0de2b73d294f14bf..82dd69d06d5456f4fe4c7e9cc82f1d832ccdc9b7 100644 (file)
--- 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 bc0f6b519d8fc744e4e0bd528d895904d85cc2f4..888616e7e7c47af7d3595de054bd32cc319790a2 100644 (file)
--- 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) )