From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 31 Dec 2013 21:45:14 +0000 (-0800)
Subject: move dir catgegories patch to a quilt patch
X-Git-Tag: debian/2.18.0-1~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b8ba43382777b2e5cf4c64147ac61afd39081603;p=lilypond.git

move dir catgegories patch to a quilt patch
---

diff --git a/debian/patches/add_dircategories_to_documentation b/debian/patches/add_dircategories_to_documentation
new file mode 100644
index 0000000000..2b93e42203
--- /dev/null
+++ b/debian/patches/add_dircategories_to_documentation
@@ -0,0 +1,653 @@
+--- lilypond-2.18.0.orig/Documentation/changes.tely
++++ lilypond-2.18.0/Documentation/changes.tely
+@@ -29,6 +29,11 @@
+ @end macro
+ 
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Changes: (lilypond-changes).   Changes to recent versions.
++@end direntry
++
+ @documentencoding utf-8
+ @documentlanguage en
+ @afourpaper
+--- lilypond-2.18.0.orig/Documentation/contributor.texi
++++ lilypond-2.18.0/Documentation/contributor.texi
+@@ -13,6 +13,11 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Contributor Guide: (lilypond-contributor).  Technical issues and policies for contributors.
++@end direntry
++
+ @macro manualIntro
+ This manual documents contributing to LilyPond version
+ @version{}.  It discusses technical issues and policies that
+--- lilypond-2.18.0.orig/Documentation/cs/learning.tely
++++ lilypond-2.18.0/Documentation/cs/learning.tely
+@@ -12,6 +12,11 @@
+ @settitle Příručka k učení se
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* Příručka LilyPond k učení se: (lilypond-learning).  Začátek je zde.
++@end direntry
++
+ @macro manualIntro
+ Tento soubor poskytuje úvod pro LilyPond verze
+ @version{}.
+--- lilypond-2.18.0.orig/Documentation/cs/web.texi
++++ lilypond-2.18.0/Documentation/cs/web.texi
+@@ -58,7 +58,6 @@
+ @c expected to be found in lilypond/ subdirectory.
+ @dircategory GNU LilyPond --- the music typesetter
+ @direntry
+-* Příručka LilyPond k učení se: (lilypond-learning).  Začátek je zde.
+ * Slovníček: (music-glossary).               Překlad pojmů z angličtiny do dalších řečí.
+ * Příručka pro zápis not v LilyPondu: (lilypond-notation).                           Příručka pro zápis not v LilyPondu.
+ * Úryvky LilyPondu: (lilypond-snippets).         Mnoho triků, rad a příkladů.
+--- lilypond-2.18.0.orig/Documentation/de/essay.tely
++++ lilypond-2.18.0/Documentation/de/essay.tely
+@@ -12,6 +12,11 @@
+ @documentlanguage de
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond automatischen Musiksatz: (lilypond-essay).  Automatischen Musiksatz von LilyPond.
++@end direntry
++
+ @c Translators: Till Paala
+ 
+ @include macros.itexi
+--- lilypond-2.18.0.orig/Documentation/de/extending.tely
++++ lilypond-2.18.0/Documentation/de/extending.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage de
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Erweiterung: (lilypond-extending).  Wie man die Funktionalität von LilyPond erweitern kann.
++@end direntry
++
+ @c Translators: Till Paala
+ 
+ @macro manualIntro
+--- lilypond-2.18.0.orig/Documentation/de/learning.tely
++++ lilypond-2.18.0/Documentation/de/learning.tely
+@@ -12,6 +12,11 @@
+ @settitle LilyPond Handbuch zum Lernen
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Handbuch zum Lernen: (lilypond-learning).  Hier beginnen.
++@end direntry
++
+ @macro manualIntro
+ Diese Datei stellt eine Einleitung für LilyPond Version
+ @version{} zur Verfügung.
+--- lilypond-2.18.0.orig/Documentation/de/notation.tely
++++ lilypond-2.18.0/Documentation/de/notation.tely
+@@ -11,6 +11,11 @@
+ @setfilename lilypond.info
+ @settitle LilyPond Benutzerhandbuch
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Notationshandbuch: (lilypond-notation).                           LilyPond Notationshandbuch.
++@end direntry
++
+ @c Translators: Till Paala
+ 
+ @afourpaper
+--- lilypond-2.18.0.orig/Documentation/de/usage.tely
++++ lilypond-2.18.0/Documentation/de/usage.tely
+@@ -12,7 +12,17 @@
+ @settitle GNU LilyPond Programmbenutzung
+ @afourpaper
+ 
+-
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Application Usage: (lilypond-usage). Programme installieren und benutzen.
++* lilypond: (lilypond-usage)LilyPond starten.  Das LilyPond-Programm aufrufen.
++* abc2ly: (lilypond-usage)abc2ly starten.      ABC-Notation importieren.
++* convert-ly: (lilypond-usage)Dateien mit convert-ly aktualisieren. Ältere LilyPond-Versionen
++* etf2ly: (lilypond-usage)etf2ly starten.      Finale-Dateien importieren.
++* lilypond-book: (lilypond-usage)LilyPond-book. Text und Musik integrieren.
++* midi2ly: (lilypond-usage)midi2ly starten.    MIDI importieren.
++* musicxml2ly: (lilypond-usage)musicxml2ly starten.  MusicXML-Dateien importieren.
++@end direntry
+ 
+ @macro manualIntro
+ Diese Datei erklärt, wie man die Programme, die mit LilyPond
+--- lilypond-2.18.0.orig/Documentation/de/web.texi
++++ lilypond-2.18.0/Documentation/de/web.texi
+@@ -58,20 +58,10 @@
+ @c expected to be found in lilypond/ subdirectory.
+ @dircategory GNU LilyPond --- the music typesetter
+ @direntry
+-* LilyPond Handbuch zum Lernen: (lilypond-learning).  Hier beginnen.
+ * Glossar: (music-glossary).               Begriffsübersetzungen von Englisch in andere Sprachen.
+-* LilyPond Notationshandbuch: (lilypond-notation).                           LilyPond Notationshandbuch.
+ * LilyPond Schnipsel: (lilypond-snippets).         Viele Tricks, Tipps und Beispiele.
+ * LilyPond Referenz der Interna: (lilypond-internals).  Definitionen zum Einstellen.
+-* LilyPond Application Usage: (lilypond-usage). Programme installieren und benutzen.
+ * LilyPond Webseite: (lilypond-web).    Vorschau der neuen Webseite.
+-* lilypond: (lilypond-usage)LilyPond starten.  Das LilyPond-Programm aufrufen.
+-* abc2ly: (lilypond-usage)abc2ly starten.      ABC-Notation importieren.
+-* convert-ly: (lilypond-usage)Dateien mit convert-ly aktualisieren. Ältere LilyPond-Versionen
+-* etf2ly: (lilypond-usage)etf2ly starten.      Finale-Dateien importieren.
+-* lilypond-book: (lilypond-usage)LilyPond-book. Text und Musik integrieren.
+-* midi2ly: (lilypond-usage)midi2ly starten.    MIDI importieren.
+-* musicxml2ly: (lilypond-usage)musicxml2ly starten.  MusicXML-Dateien importieren.
+ @end direntry
+ 
+ 
+--- lilypond-2.18.0.orig/Documentation/es/changes.tely
++++ lilypond-2.18.0/Documentation/es/changes.tely
+@@ -36,6 +36,11 @@
+ @end macro
+ 
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Changes: (lilypond-changes).   Funcionalidades nuevas.
++@end direntry
++
+ @documentencoding UTF-8
+ @documentlanguage es
+ @afourpaper
+--- lilypond-2.18.0.orig/Documentation/es/essay.tely
++++ lilypond-2.18.0/Documentation/es/essay.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage es
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* Las funciones de grabado musical automatizado: (lilypond-essay).  Las funciones de grabado musical automatizado dentro de LilyPond.
++@end direntry
++
+ @c translator: Francisco Vila
+ 
+ @macro manualIntro
+--- lilypond-2.18.0.orig/Documentation/es/extending.tely
++++ lilypond-2.18.0/Documentation/es/extending.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage es
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Extensión: (lilypond-extending).  Extender las funcionalidades de LilyPond.
++@end direntry
++
+ @c translator: Francisco Vila
+ 
+ @macro manualIntro
+--- lilypond-2.18.0.orig/Documentation/es/learning.tely
++++ lilypond-2.18.0/Documentation/es/learning.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage es
+ @afourpaper
+ 
++@dircategory GNU LilyPond: el tipografiador de música
++@direntry
++* Manual de aprendizaje de LilyPond: (lilypond-learning).  Comience por aquí.
++@end direntry
++
+ @macro manualIntro
+ Este archivo ofrece una introducción al programa LilyPond versión
+ @version{}.
+--- lilypond-2.18.0.orig/Documentation/es/notation.tely
++++ lilypond-2.18.0/Documentation/es/notation.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage es
+ @afourpaper
+ 
++@dircategory GNU LilyPond: el tipografiador de música
++@direntry
++* LilyPond: (lilypond-notation).                      Referencia de la notación con LilyPond.
++@end direntry
++
+ @macro manualIntro
+ Este manual ofrece una referencia para toda la notación musical que se
+ puede producir con LilyPond versión @version{}.  Da por sentado que el
+--- lilypond-2.18.0.orig/Documentation/essay.tely
++++ lilypond-2.18.0/Documentation/essay.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Engraving Functions: (lilypond-essay).  Automatic engraving functions within LilyPond.
++@end direntry
++
+ @macro manualIntro
+ This essay discusses automatic music engraving functions within
+ LilyPond version @version{}.
+--- lilypond-2.18.0.orig/Documentation/es/usage.tely
++++ lilypond-2.18.0/Documentation/es/usage.tely
+@@ -13,6 +13,18 @@
+ @documentlanguage es
+ @afourpaper
+ 
++@dircategory GNU LilyPond: el tipografiador de música
++@direntry
++* Utilización del programa: (lilypond-usage). Instalación y ejecución de las aplicaciones.
++* lilypond: (lilypond-usage)Ejecutar LilyPond.      Invocar el programa LilyPond.
++* abc2ly: (lilypond-usage)Invocación de abc2ly.      Importación de ABC.
++* convert-ly: (lilypond-usage)Actualización de archivos mediante convert-ly. Versiones antiguas de LilyPond.
++* etf2ly: (lilypond-usage)Invocar etf2ly.      Importación de Finale.
++* lilypond-book: (lilypond-usage)LilyPond-book. Intergrar texto y música.
++* midi2ly: (lilypond-usage)Invocar midi2ly.    Importación de MIDI.
++* musicxml2ly: (lilypond-usage)Invocar musicxml2ly.  Importación de MusicXML.
++@end direntry
++
+ @c Translators: Francisco Vila
+ 
+ @macro manualIntro
+--- lilypond-2.18.0.orig/Documentation/es/web.texi
++++ lilypond-2.18.0/Documentation/es/web.texi
+@@ -57,20 +57,10 @@
+ @c expected to be found in lilypond/ subdirectory.
+ @dircategory GNU LilyPond: el tipografiador de música
+ @direntry
+-* Manual de aprendizaje de LilyPond: (lilypond-learning).  Comience por aquí.
+ * Glosario musical: (music-glossary).                 Para usuarios de habla no inglesa.
+-* LilyPond: (lilypond-notation).                      Referencia de la notación con LilyPond.
+ * Fragmentos de código de LilyPond: (lilypond-snippets).         Consejos, trucos y ejemplos cortos.
+ * Referencia de funcionamiento interno: (lilypond-internals).  Definiciones para la construcción de trucos.
+-* Utilización del programa: (lilypond-usage). Instalación y ejecución de las aplicaciones.
+ * Página web: (lilypond-web).    Vista previa de la nueva página.
+-* lilypond: (lilypond-usage)Ejecutar LilyPond.      Invocar el programa LilyPond.
+-* abc2ly: (lilypond-usage)Invocación de abc2ly.      Importación de ABC.
+-* convert-ly: (lilypond-usage)Actualización de archivos mediante convert-ly. Versiones antiguas de LilyPond.
+-* etf2ly: (lilypond-usage)Invocar etf2ly.      Importación de Finale.
+-* lilypond-book: (lilypond-usage)LilyPond-book. Intergrar texto y música.
+-* midi2ly: (lilypond-usage)Invocar midi2ly.    Importación de MIDI.
+-* musicxml2ly: (lilypond-usage)Invocar musicxml2ly.  Importación de MusicXML.
+ @end direntry
+ 
+ 
+--- lilypond-2.18.0.orig/Documentation/extending.tely
++++ lilypond-2.18.0/Documentation/extending.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Extending: (lilypond-extending).  How to extend LilyPond's functionality.
++@end direntry
++
+ @macro manualIntro
+ This file explains how to extend the functionality of
+ LilyPond version @version{}.
+--- lilypond-2.18.0.orig/Documentation/fr/essay.tely
++++ lilypond-2.18.0/Documentation/fr/essay.tely
+@@ -16,6 +16,11 @@
+ @documentlanguage fr
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* La gravure musicale automatisée: (lilypond-essay).  La gravure musicale automatisée de LilyPond.
++@end direntry
++
+ @macro manualIntro
+ Cet essai traite de la gravure de la musique et de la notation assistée
+ par ordinateur à l'aide de LilyPond version @version{}.
+--- lilypond-2.18.0.orig/Documentation/fr/learning.tely
++++ lilypond-2.18.0/Documentation/fr/learning.tely
+@@ -13,6 +13,11 @@
+ 
+ @afourpaper
+ 
++@dircategory GNU LilyPond -- le typographe de musique
++@direntry
++* Manuel d'initiation à LilyPond: (lilypond-learning).       Les premiers pas.
++@end direntry
++
+ @macro manualIntro
+ Ce document constitue le manuel d'initiation à GNU LilyPond
+ @version{}.
+--- lilypond-2.18.0.orig/Documentation/fr/notation.tely
++++ lilypond-2.18.0/Documentation/fr/notation.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage fr
+ @afourpaper
+ 
++@dircategory GNU LilyPond -- le typographe de musique
++@direntry
++* Manuel de notation: (lilypond-notation).                   Gravure de musique avec LilyPond.
++@end direntry
++
+ @macro manualIntro
+ Ce document constitue le manuel de notation de GNU LilyPond
+ @version{}.  Sa lecture requiert une familiarité avec le contenu
+--- lilypond-2.18.0.orig/Documentation/fr/usage.tely
++++ lilypond-2.18.0/Documentation/fr/usage.tely
+@@ -13,6 +13,17 @@
+ @documentlanguage fr
+ @afourpaper
+ 
++@dircategory GNU LilyPond -- le typographe de musique
++@direntry
++* Manuel d'utilisation: (lilypond-usage).                    Installation et exécution des programmes.
++* abc2ly: (lilypond-usage) Lancement de abc2ly.              Import de fichier ABC.
++* convert-ly: (lilypond-usage) Mise à jour de fichiers.      Pour d'anciens fichiers LilyPond.
++* etf2ly: (lilypond-usage) Lancement de etf2ly.              Import de fichier Finale.
++* lilypond-book: (lilypond-usage) LilyPond-book.             Association musique-texte.
++* midi2ly: (lilypond-usage) Lancement de midi2ly.            Import de fichier MIDI.
++* musicxml2ly: (lilypond-usage) Lancement de musicxml2ly.    Import de fichier MusicXML.
++@end direntry
++
+ @c Translators: John Mandereau, Jean-Charles Malahieude
+ 
+ @macro manualIntro
+--- lilypond-2.18.0.orig/Documentation/fr/web.texi
++++ lilypond-2.18.0/Documentation/fr/web.texi
+@@ -59,19 +59,10 @@
+ @c expected to be found in lilypond/ subdirectory.
+ @dircategory GNU LilyPond -- le typographe de musique
+ @direntry
+-* Manuel d'initiation à LilyPond: (lilypond-learning).       Les premiers pas.
+ * Glossaire musicologique: (music-glossary).                 Pour l'utilisateur non anglophone.
+-* Manuel de notation: (lilypond-notation).                   Gravure de musique avec LilyPond.
+ * Morceaux choisis de LilyPond: (lilypond-snippets).         Petits trucs, astuces et exemples.
+ * Référence des propriétés internes: (lilypond-internals).   Définitions pour les retouches.
+-* Manuel d'utilisation: (lilypond-usage).                    Installation et exécution des programmes.
+ * LilyPond Website: (lilypond-web).                          Prévisualisation du site.
+-* abc2ly: (lilypond-usage) Lancement de abc2ly.              Import de fichier ABC.
+-* convert-ly: (lilypond-usage) Mise à jour de fichiers.      Pour d'anciens fichiers LilyPond.
+-* etf2ly: (lilypond-usage) Lancement de etf2ly.              Import de fichier Finale.
+-* lilypond-book: (lilypond-usage) LilyPond-book.             Association musique-texte.
+-* midi2ly: (lilypond-usage) Lancement de midi2ly.            Import de fichier MIDI.
+-* musicxml2ly: (lilypond-usage) Lancement de musicxml2ly.    Import de fichier MusicXML.
+ @end direntry
+ 
+ 
+--- lilypond-2.18.0.orig/Documentation/hu/learning.tely
++++ lilypond-2.18.0/Documentation/hu/learning.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage hu
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* Tankönyv: (lilypond-learning).  Itt kezdd az olvasást.
++@end direntry
++
+ @c Translators: Harmath Dénes
+ 
+ @macro manualIntro
+--- lilypond-2.18.0.orig/Documentation/hu/usage.tely
++++ lilypond-2.18.0/Documentation/hu/usage.tely
+@@ -13,6 +13,18 @@
+ @documentlanguage hu
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* Használat: (lilypond-usage). Az alkalmazás használata.
++* lilypond: (lilypond-usage)A lilypond futtatása.      Kották szedése.
++* abc2ly: (lilypond-usage)Az abc2ly futtatása.      ABC fájlok importálása.
++* convert-ly: (lilypond-usage)A convert-ly futtatása. Konvertálás régebbi verziókról.
++* etf2ly: (lilypond-usage)Az etf2ly futtatása.      Finale fájlok importálása.
++* lilypond-book: (lilypond-usage)A lilypond-book futtatása. Szöveg és zene integrálása.
++* midi2ly: (lilypond-usage)A midi2ly futtatása.    MIDI fájlok importálása.
++* musicxml2ly: (lilypond-usage)A musicxml2ly futtatása.  MusicXML fájlok importálása.
++@end direntry
++
+ @c translator: Team-hu
+ 
+ @macro manualIntro
+--- lilypond-2.18.0.orig/Documentation/hu/web.texi
++++ lilypond-2.18.0/Documentation/hu/web.texi
+@@ -59,20 +59,11 @@
+ @c expected to be found in lilypond/ subdirectory.
+ @dircategory GNU LilyPond --- the music typesetter
+ @direntry
+-* Tankönyv: (lilypond-learning).  Itt kezdd az olvasást.
+ * Fogalomtár: (music-glossary).               Többnyelvű szószedet.
+ * Kottaírás: (lilypond-notation).                           A kottaírás kézikönyve.
+ * Kódrészletek: (lilypond-snippets).         Tippek, trükkök, példák.
+ * Belső működés: (lilypond-internals).  A belső működés referenciája.
+-* Használat: (lilypond-usage). Az alkalmazás használata.
+ * Web: (lilypond-web).    A weboldal.
+-* lilypond: (lilypond-usage)A lilypond futtatása.      Kották szedése.
+-* abc2ly: (lilypond-usage)Az abc2ly futtatása.      ABC fájlok importálása.
+-* convert-ly: (lilypond-usage)A convert-ly futtatása. Konvertálás régebbi verziókról.
+-* etf2ly: (lilypond-usage)Az etf2ly futtatása.      Finale fájlok importálása.
+-* lilypond-book: (lilypond-usage)A lilypond-book futtatása. Szöveg és zene integrálása.
+-* midi2ly: (lilypond-usage)A midi2ly futtatása.    MIDI fájlok importálása.
+-* musicxml2ly: (lilypond-usage)A musicxml2ly futtatása.  MusicXML fájlok importálása.
+ @end direntry
+ 
+ 
+--- lilypond-2.18.0.orig/Documentation/it/learning.tely
++++ lilypond-2.18.0/Documentation/it/learning.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage it
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- il compositore tipografico di musica
++@direntry
++* Manuale di Apprendimento di LilyPond: (lilypond-learning).    Comincia da qui.
++@end direntry
++
+ @macro manualIntro
+ Questo file fornisce un'introduzione alla versione di LilyPond
+ @version{}.
+--- lilypond-2.18.0.orig/Documentation/it/usage.tely
++++ lilypond-2.18.0/Documentation/it/usage.tely
+@@ -13,6 +13,18 @@
+ @documentlanguage it
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- il compositore tipografico di musica
++@direntry
++* Uso del Programma: (lilypond-usage).                    Istallazione e esecuzione delle applicazioni.
++* lilypond: (lilypond-usage)Eseguire lilypond.                  Invocare il programma LilyPond.
++* abc2ly: (lilypond-usage)Invocare abc2ly.                      Importare ABC.
++* convert-ly: (lilypond-usage)Aggiornare i file con convert-ly. Versioni precedenti di LilyPond.
++* etf2ly: (lilypond-usage)Invocare etf2ly.                      Importare Finale.
++* lilypond-book: (lilypond-usage)lilypond-book.                 Integrare testo e musica.
++* midi2ly: (lilypond-usage)Invocare midi2ly.                    Importare MIDI.
++* musicxml2ly: (lilypond-usage)Invocare musicxml2ly.            Importare MusicXML.
++@end direntry
++
+ @c Translators: Federico Bruni
+ @c Translation checkers: Luca Rossetto Casel
+ 
+--- lilypond-2.18.0.orig/Documentation/it/web.texi
++++ lilypond-2.18.0/Documentation/it/web.texi
+@@ -228,15 +228,7 @@
+ * LilyPond: (lilypond-notation).                                Guida alla Notazione di LilyPond.
+ * Frammenti di Codice di LilyPond: (lilypond-snippets).         Piccoli trucchi, consigli, e esempi.
+ * Guida al Funzionamento Interno: (lilypond-internals).         Definizioni per le modifiche manuali.
+-* Uso del Programma: (lilypond-application).                    Istallazione e esecuzione delle applicazioni.
+ * Sito web: (lilypond-web).                                     Anteprima del nuovo sito.
+-* lilypond: (lilypond-usage)Eseguire lilypond.                  Invocare il programma LilyPond.
+-* abc2ly: (lilypond-usage)Invocare abc2ly.                      Importare ABC.
+-* convert-ly: (lilypond-usage)Aggiornare i file con convert-ly. Versioni precedenti di LilyPond.
+-* etf2ly: (lilypond-usage)Invocare etf2ly.                      Importare Finale.
+-* lilypond-book: (lilypond-usage)lilypond-book.                 Integrare testo e musica.
+-* midi2ly: (lilypond-usage)Invocare midi2ly.                    Importare MIDI.
+-* musicxml2ly: (lilypond-usage)Invocare musicxml2ly.            Importare MusicXML.
+ @end direntry
+ 
+ 
+--- lilypond-2.18.0.orig/Documentation/ja/learning.tely
++++ lilypond-2.18.0/Documentation/ja/learning.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage ja
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- 楽譜譜刻プログラム
++@direntry
++* LilyPond 学習マニュアル: (lilypond-learning).        ここから始めてください。
++@end direntry
++
+ @macro manualIntro
+ このマニュアルは LilyPond バージョン @version{} の導入部です。
+ @end macro
+--- lilypond-2.18.0.orig/Documentation/ja/notation.tely
++++ lilypond-2.18.0/Documentation/ja/notation.tely
+@@ -12,6 +12,11 @@
+ @documentlanguage ja
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- 楽譜譜刻プログラム
++@direntry
++* LilyPond: (lilypond-notation).                       LilyPond 記譜法リファレンス。
++@end direntry
++
+ @macro manualIntro
+ このマニュアルは LilyPond バージョン @version{} で提供される@c
+ すべての記譜法についての参照を提供します。@c
+--- lilypond-2.18.0.orig/Documentation/ja/usage.tely
++++ lilypond-2.18.0/Documentation/ja/usage.tely
+@@ -13,6 +13,19 @@
+ @documentlanguage ja
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- 楽譜譜刻プログラム
++@direntry
++* LilyPond アプリケーション使用方法: (lilypond-usage). アプリケーションを@c
++インスールして、実行する方法。
++* lilypond: (lilypond-usage)lilypond を実行する.       LilyPond を呼び出す。
++* abc2ly: (lilypond-usage)abc2ly を呼び出す.           ABC をインポートする。
++* convert-ly: (lilypond-usage)convert-ly でファイルを更新する. 古い LilyPond バージョン。
++* etf2ly: (lilypond-usage)etf2ly を呼び出す.           Finale をインポートする。
++* lilypond-book: (lilypond-usage)lilypond-book.        文章と楽譜を統合する。
++* midi2ly: (lilypond-usage)midi2ly を呼び出す.         MIDI をインポートする。
++* musicxml2ly: (lilypond-usage)musicxml2ly を呼び出す. MusicXML をインポートする。
++@end direntry
++
+ @macro manualIntro
+ このマニュアルは LilyPond バージョン @version{} で配布される@c
+ プログラムの実効方法について説明します。@c
+--- lilypond-2.18.0.orig/Documentation/learning.tely
++++ lilypond-2.18.0/Documentation/learning.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Learning Manual: (lilypond-learning).  Start here.
++@end direntry
++
+ @macro manualIntro
+ This file provides an introduction to LilyPond version
+ @version{}.
+--- lilypond-2.18.0.orig/Documentation/music-glossary.tely
++++ lilypond-2.18.0/Documentation/music-glossary.tely
+@@ -6,6 +6,11 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* Music Glossary: (music-glossary).               For non-English users.
++@end direntry
++
+ @macro manualIntro
+ This glossary provides definitions and translations of musical
+ terms used in the documentation manuals for LilyPond version
+--- lilypond-2.18.0.orig/Documentation/nl/learning.tely
++++ lilypond-2.18.0/Documentation/nl/learning.tely
+@@ -19,6 +19,11 @@
+ @documentlanguage nl
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Learning Manual: (lilypond-learning).  Start here.
++@end direntry
++
+ @macro manualIntro
+ This file provides an introduction to LilyPond version
+ @version{}.
+--- lilypond-2.18.0.orig/Documentation/notation.tely
++++ lilypond-2.18.0/Documentation/notation.tely
+@@ -13,6 +13,11 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
++@end direntry
++
+ @macro manualIntro
+ This manual provides a reference for all notation that can be
+ produced with LilyPond version @version{}.  It assumes that
+--- lilypond-2.18.0.orig/Documentation/snippets.tely
++++ lilypond-2.18.0/Documentation/snippets.tely
+@@ -6,6 +6,11 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
++@end direntry
++
+ @macro manualIntro
+ This document shows a selected set of LilyPond snippets from the
+ @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
+--- lilypond-2.18.0.orig/Documentation/usage.tely
++++ lilypond-2.18.0/Documentation/usage.tely
+@@ -13,6 +13,18 @@
+ @documentlanguage en
+ @afourpaper
+ 
++@dircategory GNU LilyPond --- the music typesetter
++@direntry
++* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
++* lilypond: (lilypond-usage)Running lilypond.      Invoking the LilyPond program.
++* abc2ly: (lilypond-usage)Invoking abc2ly.      Importing ABC.
++* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
++* etf2ly: (lilypond-usage)Invoking etf2ly.      Importing Finale.
++* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
++* midi2ly: (lilypond-usage)Invoking midi2ly.    Importing MIDI.
++* musicxml2ly: (lilypond-usage)Invoking musicxml2ly.  Importing MusicXML.
++@end direntry
++
+ @macro manualIntro
+ This file explains how to execute the programs distributed with
+ LilyPond version @version{}.  In addition, it suggests some
+--- lilypond-2.18.0.orig/Documentation/web.texi
++++ lilypond-2.18.0/Documentation/web.texi
+@@ -56,20 +56,8 @@
+ @c expected to be found in lilypond/ subdirectory.
+ @dircategory GNU LilyPond --- the music typesetter
+ @direntry
+-* LilyPond Learning Manual: (lilypond-learning).  Start here.
+-* Music Glossary: (music-glossary).               For non-English users.
+-* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
+-* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
+ * LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
+-* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
+ * LilyPond Website: (lilypond-web).    Preview of new website.
+-* lilypond: (lilypond-usage)Running lilypond.      Invoking the LilyPond program.
+-* abc2ly: (lilypond-usage)Invoking abc2ly.      Importing ABC.
+-* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
+-* etf2ly: (lilypond-usage)Invoking etf2ly.      Importing Finale.
+-* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
+-* midi2ly: (lilypond-usage)Invoking midi2ly.    Importing MIDI.
+-* musicxml2ly: (lilypond-usage)Invoking musicxml2ly.  Importing MusicXML.
+ @end direntry
+ 
+