]>
Commit | Line | Data |
---|---|---|
4e10dce8 JB |
1 | --- lilypond-2.22.0/Documentation/en/web.texi.orig 2021-04-11 18:33:38.416188626 +0200 |
2 | +++ lilypond-2.22.0/Documentation/en/web.texi 2021-04-11 18:53:43.506326759 +0200 | |
3 | @@ -49,30 +49,26 @@ | |
d31b09e8 JB |
4 | |
5 | @c Info files are no longer installed in a subdirectory, images are | |
6 | @c expected to be found in lilypond/ subdirectory. | |
4e10dce8 JB |
7 | -@dircategory LilyPond -- the music typesetter |
8 | +@dircategory LilyPond: | |
d31b09e8 | 9 | @direntry |
4e10dce8 JB |
10 | -* Changes: (lilypond-changes). News since version 2.20. |
11 | -* Contributing: (lilypond-contributor). How to contribute to LilyPond. | |
12 | -* Essay: (lilypond-essay). The philosophy behind LilyPond. | |
13 | -* Extending: (lilypond-extending). How to use Scheme in LilyPond. | |
14 | -* Internals: (lilypond-internals). Tweaking reference. | |
15 | -* Learning: (lilypond-learning). Introduction. Start here. | |
16 | -* Music Glossary: (music-glossary). For non-English users. | |
17 | -* Notation: (lilypond-notation). Notation reference. | |
18 | -* Snippets: (lilypond-snippets). Tricks, tips, and examples. | |
19 | -* Usage: (lilypond-usage). How to install and use LilyPond. | |
20 | -* Website: (lilypond-web). Info version of lilypond.org. | |
21 | -@end direntry | |
22 | - | |
23 | -@dircategory LilyPond applications | |
24 | -@direntry | |
25 | -* abc2ly: (lilypond-usage)Invoking abc2ly. Importing ABC files. | |
26 | -* convert-ly: (lilypond-usage)Updating files with convert-ly. Handling older LilyPond files. | |
27 | -* etf2ly: (lilypond-usage)Invoking etf2ly. Importing Finale files. | |
28 | -* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music. | |
29 | -* lilypond: (lilypond-usage)Running lilypond. Invoking the LilyPond program. | |
30 | -* midi2ly: (lilypond-usage)Invoking midi2ly. Importing MIDI files. | |
31 | -* musicxml2ly: (lilypond-usage)Invoking musicxml2ly. Importing MusicXML files. | |
32 | +* Changes: (lilypond-changes). News since version 2.20 | |
33 | +* Contributing: (lilypond-contributor). How to contribute to LilyPond | |
34 | +* Essay: (lilypond-essay). The philosophy behind LilyPond | |
35 | +* Extending: (lilypond-extending). How to use Scheme in LilyPond | |
36 | +* Internals: (lilypond-internals). Tweaking reference | |
37 | +* Learning: (lilypond-learning). Introduction. Start here | |
38 | +* Music Glossary: (music-glossary). For non-English users | |
39 | +* Notation: (lilypond-notation). Notation reference | |
40 | +* Snippets: (lilypond-snippets). Tricks, tips, and examples | |
41 | +* Usage: (lilypond-usage). How to install and use LilyPond | |
42 | +* Website: (lilypond-web). Info version of lilypond.org | |
43 | +* abc2ly: (lilypond-usage)abc2ly. Importing ABC files | |
44 | +* convert-ly: (lilypond-usage)convert-ly. Handling older LilyPond files | |
45 | +* etf2ly: (lilypond-usage)etf2ly. Importing Finale files | |
46 | +* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music | |
47 | +* lilypond: (lilypond-usage)lilypond. Invoking the LilyPond program | |
48 | +* midi2ly: (lilypond-usage)midi2ly. Importing MIDI files | |
49 | +* musicxml2ly: (lilypond-usage)musicxml2ly. Importing MusicXML files | |
d31b09e8 JB |
50 | @end direntry |
51 | ||
52 | ||
4e10dce8 JB |
53 | --- lilypond-2.20.0/Documentation/en/usage/running.itely.orig 2020-03-01 15:00:51.000000000 +0100 |
54 | +++ lilypond-2.20.0/Documentation/en/usage/running.itely 2020-06-28 21:12:32.931411423 +0200 | |
d31b09e8 JB |
55 | @@ -11,7 +11,7 @@ |
56 | @c \version "2.17.6" | |
57 | ||
58 | ||
59 | -@node Running lilypond | |
60 | +@node lilypond | |
61 | @chapter Running @command{lilypond} | |
62 | ||
63 | This chapter details the technicalities of running LilyPond. | |
4e10dce8 JB |
64 | --- lilypond-2.20.0/Documentation/en/usage/external.itely.orig 2020-03-01 15:00:51.000000000 +0100 |
65 | +++ lilypond-2.20.0/Documentation/en/usage/external.itely 2020-06-28 21:13:35.291073592 +0200 | |
d31b09e8 | 66 | @@ -423,15 +423,15 @@ |
07662556 | 67 | bug reports will almost certainly not be resolved. |
9079e26d | 68 | |
9079e26d | 69 | @menu |
04517bc7 | 70 | -* Invoking midi2ly:: Importing MIDI. |
07662556 TP |
71 | -* Invoking musicxml2ly:: Importing MusicXML. |
72 | -* Invoking abc2ly:: Importing ABC. | |
04517bc7 | 73 | -* Invoking etf2ly:: Importing Finale. |
d31b09e8 JB |
74 | +* midi2ly:: Importing MIDI |
75 | +* musicxml2ly:: Importing MusicXML | |
76 | +* abc2ly:: Importing ABC | |
77 | +* etf2ly:: Importing Finale | |
78 | * Other formats:: | |
9079e26d JB |
79 | @end menu |
80 | ||
9079e26d | 81 | |
9079e26d JB |
82 | -@node Invoking midi2ly |
83 | +@node midi2ly | |
d31b09e8 | 84 | @subsection Invoking @command{midi2ly} |
9079e26d JB |
85 | |
86 | @cindex MIDI | |
d31b09e8 | 87 | @@ -516,7 +516,7 @@ |
bf220b43 | 88 | to a single duration and add phrase markings or pedal indicators. |
9079e26d JB |
89 | |
90 | ||
62125a6e JB |
91 | -@node Invoking musicxml2ly |
92 | +@node musicxml2ly | |
d31b09e8 | 93 | @subsection Invoking @code{musicxml2ly} |
62125a6e | 94 | |
07662556 | 95 | @cindex MusicXML |
d31b09e8 | 96 | @@ -631,7 +631,7 @@ |
62125a6e | 97 | @end table |
9079e26d | 98 | |
07662556 | 99 | |
9079e26d JB |
100 | -@node Invoking abc2ly |
101 | +@node abc2ly | |
d31b09e8 | 102 | @subsection Invoking @code{abc2ly} |
9079e26d | 103 | |
d31b09e8 JB |
104 | @warning{This is not currently supported and may eventually be removed |
105 | @@ -699,7 +699,7 @@ | |
07662556 TP |
106 | @command{abc2ly} ignores the ABC beaming. |
107 | ||
108 | ||
109 | -@node Invoking etf2ly | |
110 | +@node etf2ly | |
d31b09e8 JB |
111 | @subsection Invoking @command{etf2ly} |
112 | ||
113 | @warning{This is not currently supported and may eventually be removed | |
4e10dce8 JB |
114 | --- lilypond-2.20.0/Documentation/en/usage/updating.itely.orig 2020-03-01 15:00:51.000000000 +0100 |
115 | +++ lilypond-2.20.0/Documentation/en/usage/updating.itely 2020-06-28 21:16:13.556882859 +0200 | |
d31b09e8 JB |
116 | @@ -11,7 +11,7 @@ |
117 | @c \version "2.16.0" | |
118 | ||
119 | ||
120 | -@node Updating files with convert-ly | |
121 | +@node convert-ly | |
122 | @chapter Updating files with @command{convert-ly} | |
123 | ||
124 | @cindex Updating a LilyPond file | |
4e10dce8 JB |
125 | --- lilypond-2.20.0/Documentation/en/usage/suggestions.itely.orig 2020-03-01 15:00:51.000000000 +0100 |
126 | +++ lilypond-2.20.0/Documentation/en/usage/suggestions.itely 2020-06-29 11:27:27.823523150 +0200 | |
d31b09e8 JB |
127 | @@ -61,7 +61,7 @@ |
128 | @strong{Always include a @code{\version} number in your input files} no | |
129 | matter how small they are. This prevents having to remember which | |
130 | version of LilyPond the file was created with and is especially relevant | |
131 | -when @ref{Updating files with convert-ly} command (which requires the | |
132 | +when @ref{convert-ly} command (which requires the | |
133 | @code{\version} statement to be present); or if sending your input files | |
134 | to other users (e.g. when asking for help on the mail lists). Note that | |
135 | all of the LilyPond templates contain @code{\version} numbers. | |
4e10dce8 JB |
136 | --- lilypond-2.20.0/Documentation/en/usage.tely.orig 2020-03-01 15:00:51.000000000 +0100 |
137 | +++ lilypond-2.20.0/Documentation/en/usage.tely 2020-06-29 11:28:03.389997136 +0200 | |
d31b09e8 JB |
138 | @@ -52,8 +52,8 @@ |
139 | @c maybe add a "Tasks" or "Specific tasks" or something like | |
140 | @c that, after Suggestions -gp | |
9079e26d | 141 | @menu |
d31b09e8 JB |
142 | -* Running lilypond:: Operation. |
143 | -* Updating files with convert-ly:: Updating input files. | |
144 | +* lilypond:: Operation. | |
145 | +* convert-ly:: Updating input files. | |
146 | * lilypond-book:: Integrating text and music. | |
147 | * External programs:: Mixing LilyPond and other programs. | |
148 | * Suggestions for writing files:: Best practices and effective bug-fixing. | |
4e10dce8 JB |
149 | --- lilypond-2.20.0/scm/documentation-lib.scm.orig 2020-03-01 15:00:51.000000000 +0100 |
150 | +++ lilypond-2.20.0/scm/documentation-lib.scm 2020-06-28 12:51:02.494425306 +0200 | |
151 | @@ -137,10 +137,10 @@ | |
152 | "\\input texinfo @c -*-texinfo-*-" | |
153 | "\n@setfilename " file-name ".info" | |
154 | "\n@settitle " name | |
155 | - "\n@dircategory LilyPond" | |
156 | + "\n@dircategory LilyPond:" | |
157 | "\n@direntry" | |
158 | ;; prepend GNU for dir, must be unique | |
159 | - "\n* GNU " name ": (" file-name "). " name "." | |
9573b615 | 160 | + (string-pad-right (string-append "\n* " name ": (" top ").") 57) name |
4e10dce8 JB |
161 | "\n@end direntry\n" |
162 | "@documentlanguage en\n" | |
163 | "@documentencoding UTF-8\n")) | |
9573b615 JB |
164 | --- lilypond-2.22.0/scm/documentation-generate.scm.orig 2021-01-10 15:22:46.000000000 +0100 |
165 | +++ lilypond-2.22.0/scm/documentation-generate.scm 2021-04-15 20:15:29.020808775 +0200 | |
166 | @@ -102,7 +102,7 @@ | |
167 | (display | |
168 | (string-append | |
169 | (texi-file-head "LilyPond Internals Reference" file-name | |
170 | - "(lilypond-internals.info)") | |
171 | + "lilypond-internals") | |
172 | " | |
173 | ||
174 | @include macros.itexi |