---- lilypond-1.6.0/Documentation/user/lilypond.tely.orig Mon Aug 19 03:55:44 2002
-+++ lilypond-1.6.0/Documentation/user/lilypond.tely Wed Apr 2 00:33:09 2003
-@@ -12,20 +12,18 @@
- ./install-info --info-dir=/usr/share/info out/lilypond.info
-
- @end ignore
--@dircategory GNU music project
-+@dircategory Miscellaneous:
+--- lilypond-2.22.0/Documentation/en/web.texi.orig 2021-04-11 18:33:38.416188626 +0200
++++ lilypond-2.22.0/Documentation/en/web.texi 2021-04-11 18:53:43.506326759 +0200
+@@ -49,30 +49,26 @@
+
+ @c Info files are no longer installed in a subdirectory, images are
+ @c expected to be found in lilypond/ subdirectory.
+-@dircategory LilyPond -- the music typesetter
++@dircategory LilyPond:
@direntry
- @c ;; prepend GNU for dir, must be unique
--* GNU LilyPond: (lilypond). The GNU music typesetter.
--* ly2dvi: (lilypond)Invoking ly2dvi:: Titling LilyPond scores.
--* convert-ly: (lilypond)Invoking convert-ly::
-- Older LilyPond versions.
--* midi2ly: (lilypond)Invoking midi2ly:: Importing MIDI.
--* etf2ly: (lilypond)Invoking etf2ly:: Importing Finale.
--* abc2ly: (lilypond)Invoking abc2ly:: Importing ABC.
--* pmx2ly: (lilypond)Invoking pmx2ly:: Importing PMX.
--* musedata2ly: (lilypond)Invoking musedata2ly::
-- Importing Musedata.
--* mup2ly: (lilypond)Invoking mup2ly:: Importing MUP.
-+* GNU LilyPond: (lilypond). The GNU music typesetter
-+* ly2dvi: (lilypond)ly2dvi:: Titling LilyPond scores
-+* convert-ly: (lilypond)convert-ly:: Older LilyPond versions
-+* midi2ly: (lilypond)midi2ly:: Importing MIDI
-+* etf2ly: (lilypond)etf2ly:: Importing Finale
-+* abc2ly: (lilypond)abc2ly:: Importing ABC
-+* pmx2ly: (lilypond)pmx2ly:: Importing PMX
-+* musedata2ly: (lilypond)musedata2ly:: Importing Musedata
-+* mup2ly: (lilypond)mup2ly:: Importing MUP
+-* Changes: (lilypond-changes). News since version 2.20.
+-* Contributing: (lilypond-contributor). How to contribute to LilyPond.
+-* Essay: (lilypond-essay). The philosophy behind LilyPond.
+-* Extending: (lilypond-extending). How to use Scheme in LilyPond.
+-* Internals: (lilypond-internals). Tweaking reference.
+-* Learning: (lilypond-learning). Introduction. Start here.
+-* Music Glossary: (music-glossary). For non-English users.
+-* Notation: (lilypond-notation). Notation reference.
+-* Snippets: (lilypond-snippets). Tricks, tips, and examples.
+-* Usage: (lilypond-usage). How to install and use LilyPond.
+-* Website: (lilypond-web). Info version of lilypond.org.
+-@end direntry
+-
+-@dircategory LilyPond applications
+-@direntry
+-* abc2ly: (lilypond-usage)Invoking abc2ly. Importing ABC files.
+-* convert-ly: (lilypond-usage)Updating files with convert-ly. Handling older LilyPond files.
+-* etf2ly: (lilypond-usage)Invoking etf2ly. Importing Finale files.
+-* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
+-* lilypond: (lilypond-usage)Running lilypond. Invoking the LilyPond program.
+-* midi2ly: (lilypond-usage)Invoking midi2ly. Importing MIDI files.
+-* musicxml2ly: (lilypond-usage)Invoking musicxml2ly. Importing MusicXML files.
++* Changes: (lilypond-changes). News since version 2.20
++* Contributing: (lilypond-contributor). How to contribute to LilyPond
++* Essay: (lilypond-essay). The philosophy behind LilyPond
++* Extending: (lilypond-extending). How to use Scheme in LilyPond
++* Internals: (lilypond-internals). Tweaking reference
++* Learning: (lilypond-learning). Introduction. Start here
++* Music Glossary: (music-glossary). For non-English users
++* Notation: (lilypond-notation). Notation reference
++* Snippets: (lilypond-snippets). Tricks, tips, and examples
++* Usage: (lilypond-usage). How to install and use LilyPond
++* Website: (lilypond-web). Info version of lilypond.org
++* abc2ly: (lilypond-usage)abc2ly. Importing ABC files
++* convert-ly: (lilypond-usage)convert-ly. Handling older LilyPond files
++* etf2ly: (lilypond-usage)etf2ly. Importing Finale files
++* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music
++* lilypond: (lilypond-usage)lilypond. Invoking the LilyPond program
++* midi2ly: (lilypond-usage)midi2ly. Importing MIDI files
++* musicxml2ly: (lilypond-usage)musicxml2ly. Importing MusicXML files
@end direntry
-@@ -90,7 +88,7 @@
- * Tutorial:: A tutorial introduction to LilyPond.
- * Reference Manual:: Reference Manual.
- * Advanced Topics:: How it all works.
--* Invoking LilyPond:: Operation.
-+* LilyPond:: Operation.
- * Converting from other formats:: Converting to lilypond source format.
- * Integrating text and music with lilypond-book::
- The lilypond-book manual.
---- lilypond-1.4.13/scm/documentation-lib.scm.orig Fri Apr 6 18:06:46 2001
-+++ lilypond-1.4.13/scm/documentation-lib.scm Sat Nov 2 13:13:40 2002
-@@ -108,10 +108,10 @@
- "\\input texinfo @c -*-texinfo-*-"
- "\n@setfilename " file-name ".info"
- "\n@settitle " name
-- "\n@dircategory GNU music project"
-+ "\n@dircategory Miscellaneous:"
- "\n@direntry"
- ;; prepend GNU for dir, must be unique
-- "\n* GNU " name ": (" file-name "). " name "."
-+ "\n* GNU " name ": (" file-name "). " name
- "\n@end direntry"
- ;; ugh, prev and next should be settable, of course
- (node "Top") ",(lilypond)Index,(lilypond)Full Grob interface list," top
---- lilypond-1.6.0/Documentation/user/converters.itely.orig Mon Aug 19 03:55:44 2002
-+++ lilypond-1.6.0/Documentation/user/converters.itely Wed Apr 2 20:18:49 2003
-@@ -4,17 +4,17 @@
- @chapter Converting from other formats
+--- lilypond-2.20.0/Documentation/en/usage/running.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/en/usage/running.itely 2020-06-28 21:12:32.931411423 +0200
+@@ -11,7 +11,7 @@
+ @c \version "2.17.6"
- @menu
--* Invoking convert-ly:: Older LilyPond versions.
--* Invoking midi2ly:: Importing MIDI.
--* Invoking etf2ly:: Importing Finale.
--* Invoking abc2ly:: Importing ABC.
--* Invoking pmx2ly:: Importing PMX.
--* Invoking musedata2ly:: Importing Musedata.
--* Invoking mup2ly:: Importing MUP.
-+* convert-ly:: Older LilyPond versions.
-+* midi2ly:: Importing MIDI.
-+* etf2ly:: Importing Finale.
-+* abc2ly:: Importing ABC.
-+* pmx2ly:: Importing PMX.
-+* musedata2ly:: Importing Musedata.
-+* mup2ly:: Importing MUP.
- @end menu
+-@node Running lilypond
++@node lilypond
+ @chapter Running @command{lilypond}
--@node Invoking convert-ly
-+@node convert-ly
- @section Invoking convert-ly
+ This chapter details the technicalities of running LilyPond.
+--- lilypond-2.20.0/Documentation/en/usage/external.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/en/usage/external.itely 2020-06-28 21:13:35.291073592 +0200
+@@ -423,15 +423,15 @@
+ bug reports will almost certainly not be resolved.
- Convert-ly sequentially applies different conversions to upgrade a
-@@ -61,7 +61,7 @@
+ @menu
+-* Invoking midi2ly:: Importing MIDI.
+-* Invoking musicxml2ly:: Importing MusicXML.
+-* Invoking abc2ly:: Importing ABC.
+-* Invoking etf2ly:: Importing Finale.
++* midi2ly:: Importing MIDI
++* musicxml2ly:: Importing MusicXML
++* abc2ly:: Importing ABC
++* etf2ly:: Importing Finale
+ * Other formats::
+ @end menu
- Not all language changes are handled. Only one output options can be specified.
-@node Invoking midi2ly
+@node midi2ly
- @section Invoking midi2ly
+ @subsection Invoking @command{midi2ly}
@cindex MIDI
-@@ -124,7 +124,7 @@
- @end table
+@@ -516,7 +516,7 @@
+ to a single duration and add phrase markings or pedal indicators.
--@node Invoking etf2ly
-+@node etf2ly
- @section Invoking etf2ly
+-@node Invoking musicxml2ly
++@node musicxml2ly
+ @subsection Invoking @code{musicxml2ly}
- @cindex ETF
-@@ -158,7 +158,7 @@
- etf2ly.
+ @cindex MusicXML
+@@ -631,7 +631,7 @@
+ @end table
-@node Invoking abc2ly
+@node abc2ly
- @section Invoking abc2ly
-
- @cindex ABC
-@@ -216,7 +216,7 @@
-
- abc2ly ignores the ABC beaming.
+ @subsection Invoking @code{abc2ly}
--@node Invoking pmx2ly
-+@node pmx2ly
- @section Invoking pmx2ly
+ @warning{This is not currently supported and may eventually be removed
+@@ -699,7 +699,7 @@
+ @command{abc2ly} ignores the ABC beaming.
- PMX is a MusiXTeX preprocessor written by Don Simons. More information
-@@ -249,7 +249,7 @@
- @end table
-
-
--@node Invoking musedata2ly
-+@node musedata2ly
- @section Invoking musedata2ly
- @cindex Musedata
-@@ -284,7 +284,7 @@
+-@node Invoking etf2ly
++@node etf2ly
+ @subsection Invoking @command{etf2ly}
- musedata2ly converts only a small subset musedata.
+ @warning{This is not currently supported and may eventually be removed
+--- lilypond-2.20.0/Documentation/en/usage/updating.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/en/usage/updating.itely 2020-06-28 21:16:13.556882859 +0200
+@@ -11,7 +11,7 @@
+ @c \version "2.16.0"
--@node Invoking mup2ly
-+@node mup2ly
- @section Invoking mup2ly
- MUP (Music Publisher) is a shareware music notation program by Arkkra
---- lilypond-1.6.0/Documentation/user/invoking.itexi.orig Mon Aug 19 03:55:44 2002
-+++ lilypond-1.6.0/Documentation/user/invoking.itexi Wed Apr 2 20:20:05 2003
-@@ -1,11 +1,11 @@
- @c -*-texinfo-*-
--@node Invoking LilyPond
-+@node LilyPond
- @chapter Invoking LilyPond
+-@node Updating files with convert-ly
++@node convert-ly
+ @chapter Updating files with @command{convert-ly}
+ @cindex Updating a LilyPond file
+--- lilypond-2.20.0/Documentation/en/usage/suggestions.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/en/usage/suggestions.itely 2020-06-29 11:27:27.823523150 +0200
+@@ -61,7 +61,7 @@
+ @strong{Always include a @code{\version} number in your input files} no
+ matter how small they are. This prevents having to remember which
+ version of LilyPond the file was created with and is especially relevant
+-when @ref{Updating files with convert-ly} command (which requires the
++when @ref{convert-ly} command (which requires the
+ @code{\version} statement to be present); or if sending your input files
+ to other users (e.g. when asking for help on the mail lists). Note that
+ all of the LilyPond templates contain @code{\version} numbers.
+--- lilypond-2.20.0/Documentation/en/usage.tely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/en/usage.tely 2020-06-29 11:28:03.389997136 +0200
+@@ -52,8 +52,8 @@
+ @c maybe add a "Tasks" or "Specific tasks" or something like
+ @c that, after Suggestions -gp
@menu
- * Reporting bugs::
- * Website::
--* Invoking ly2dvi:: Titling LilyPond scores.
-+* ly2dvi:: Titling LilyPond scores.
- @end menu
-
- @cindex Invoking LilyPond
-@@ -230,7 +230,7 @@
- website at @uref{http://www.lilypond.org/}.
-
-
--@node Invoking ly2dvi
-+@node ly2dvi
- @section Invoking ly2dvi
-
- Nicely titled output is created through a separate program:
---- lilypond-1.6.0/Documentation/user/lilypond-book.itely.orig Mon Aug 19 03:55:44 2002
-+++ lilypond-1.6.0/Documentation/user/lilypond-book.itely Wed Apr 2 20:20:30 2003
-@@ -34,7 +34,7 @@
- * Integrating La@TeX{} and music::
- * Integrating HTML and music::
- * Music fragment options::
--* Invoking lilypond-book::
-+* lilypond-book::
- @end menu
-
-
-@@ -282,7 +282,7 @@
- starting note.
- @end table
-
--@node Invoking lilypond-book
-+@node lilypond-book
- @section Invoking lilypond-book
-
- When you run @command{lilypond-book} it will generate lots of small
---- lilypond-1.6.0/Documentation/user/refman.itely.orig Mon Aug 19 03:55:44 2002
-+++ lilypond-1.6.0/Documentation/user/refman.itely Wed Apr 2 20:20:59 2003
-@@ -522,7 +522,7 @@
-
- Another option is to enter the music using your favorite MIDI
- sequencer, and then import it using midi2ly. midi2ly is described in
--@ref{Invoking midi2ly}.
-+@ref{midi2ly}.
-
-
- @c . {Relative}
---- lilypond-1.6.0/Documentation/user/tutorial.itely.orig Wed Apr 2 20:21:27 2003
-+++ lilypond-1.6.0/Documentation/user/tutorial.itely Wed Apr 2 20:21:06 2003
-@@ -1749,7 +1749,7 @@
- for. When you compile this file, the version number will be checked
- and you will get a warning when the file is too old. This version
- number is also used by the @code{convert-ly} program (See
--@ref{Invoking convert-ly}), which can used to update the file to the
-+@ref{convert-ly}), which can used to update the file to the
- latest lily version.
-
-
+-* Running lilypond:: Operation.
+-* Updating files with convert-ly:: Updating input files.
++* lilypond:: Operation.
++* convert-ly:: Updating input files.
+ * lilypond-book:: Integrating text and music.
+ * External programs:: Mixing LilyPond and other programs.
+ * Suggestions for writing files:: Best practices and effective bug-fixing.
+--- lilypond-2.20.0/scm/documentation-lib.scm.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/scm/documentation-lib.scm 2020-06-28 12:51:02.494425306 +0200
+@@ -137,10 +137,10 @@
+ "\\input texinfo @c -*-texinfo-*-"
+ "\n@setfilename " file-name ".info"
+ "\n@settitle " name
+- "\n@dircategory LilyPond"
++ "\n@dircategory LilyPond:"
+ "\n@direntry"
+ ;; prepend GNU for dir, must be unique
+- "\n* GNU " name ": (" file-name "). " name "."
++ (string-pad-right (string-append "\n* " name ": (" top ").") 57) name
+ "\n@end direntry\n"
+ "@documentlanguage en\n"
+ "@documentencoding UTF-8\n"))
+--- lilypond-2.22.0/scm/documentation-generate.scm.orig 2021-01-10 15:22:46.000000000 +0100
++++ lilypond-2.22.0/scm/documentation-generate.scm 2021-04-15 20:15:29.020808775 +0200
+@@ -102,7 +102,7 @@
+ (display
+ (string-append
+ (texi-file-head "LilyPond Internals Reference" file-name
+- "(lilypond-internals.info)")
++ "lilypond-internals")
+ "
+
+ @include macros.itexi