From 05321651998ea6b04cd6649f5d4dcdd9b102d7f5 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 1 Sep 2010 11:54:29 +0100 Subject: [PATCH] Build: un-nodify markup-*-commands.tely --- .../de/notation/notation-appendices.itely | 31 ++++++++--------- .../es/notation/notation-appendices.itely | 31 ++++++++--------- .../fr/notation/notation-appendices.itely | 26 +++++---------- .../notation/notation-appendices.itely | 29 +++++++--------- scm/document-markup.scm | 33 ++++++++----------- scm/documentation-generate.scm | 21 ++++++++---- 6 files changed, 73 insertions(+), 98 deletions(-) diff --git a/Documentation/de/notation/notation-appendices.itely b/Documentation/de/notation/notation-appendices.itely index 1fb8c1f7c3..6a66586a60 100644 --- a/Documentation/de/notation/notation-appendices.itely +++ b/Documentation/de/notation/notation-appendices.itely @@ -16,24 +16,6 @@ @appendix Notationsübersicht @translationof Notation manual tables -@c Please do not delete the following @ignore block. -@ignore -Note for editors and translators: In the following menu, two entries -are needed to link to a pair of automatically generated sections. -Please keep them and, if using emacs, do not run -texinfo-all-menus-update without manually restoring them back. These -menu entries are: - -* Text markup commands:: -* Text markup list commands:: - -and they should go just after -* Notenkopfstile:: - -and just before -* Liste der Artikulationszeichen:: -@end ignore - @menu * Liste der Akkordbezeichnungen:: * Übliche Akkord-Variablen:: @@ -895,10 +877,23 @@ Folgende Stile können zur Darstellung der Notenköpfe verwendet werden: @lilypondfile[noindent]{note-head-style.ly} + +@node Text markup commands +@appendixsec Text markup commands +@translationof Text markup commands + @include markup-commands.tely + +@node Text markup list commands +@appendixsec Text markup list commands +@translationof Text markup list commands + +The following commands can all be used with @code{\markuplines}: + @include markup-list-commands.tely + @node Liste der Artikulationszeichen @appendixsec Liste der Artikulationszeichen @translationof List of articulations diff --git a/Documentation/es/notation/notation-appendices.itely b/Documentation/es/notation/notation-appendices.itely index 56ec5ac88d..5cacd4d3d0 100644 --- a/Documentation/es/notation/notation-appendices.itely +++ b/Documentation/es/notation/notation-appendices.itely @@ -14,24 +14,6 @@ @appendix Tablas del manual sobre notación @translationof Notation manual tables -@c Please do not delete the following @ignore block. -@ignore -Note for editors and translators: In the following menu, two entries -are needed to link to a pair of automatically generated sections. -Please keep them and, if using emacs, do not run -texinfo-all-menus-update without manually restoring them back. These -menu entries are: - -* Text markup commands:: -* Text markup list commands:: - -and they should go just after -* Estilos de cabezas de nota:: - -and just before -* Lista de articulaciones:: -@end ignore - @menu * Cuadro de nombres de acordes:: * Modificadores de acorde más usuales:: @@ -888,10 +870,23 @@ Se pueden usar los siguientes estilos para las cabezas de las notas. @lilypondfile[noindent]{note-head-style.ly} + +@node Text markup commands +@appendixsec Text markup commands +@translationof Text markup commands + @include markup-commands.tely + +@node Text markup list commands +@appendixsec Text markup list commands +@translationof Text markup list commands + +The following commands can all be used with @code{\markuplines}: + @include markup-list-commands.tely + @node Lista de articulaciones @appendixsec Lista de articulaciones @translationof List of articulations diff --git a/Documentation/fr/notation/notation-appendices.itely b/Documentation/fr/notation/notation-appendices.itely index a9c1cfa494..dbdb32b72a 100644 --- a/Documentation/fr/notation/notation-appendices.itely +++ b/Documentation/fr/notation/notation-appendices.itely @@ -16,24 +16,6 @@ @appendix Tables du manuel de notation @translationof Notation manual tables -@c Please do not delete the following @ignore block. -@ignore -Note for editors and translators: In the following menu, two entries -are needed to link to a pair of automatically generated sections. -Please keep them and, if using emacs, do not run -texinfo-all-menus-update without manually restoring them back. These -menu entries are: - -* Text markup commands:: -* Text markup list commands:: - -and they should go just after -* Styles de tête de note:: - -and just before -* Liste des signes d'articulation:: -@end ignore - @menu * Table des noms d'accord:: * Modificateurs d'accord usuels:: @@ -893,12 +875,20 @@ Voici les différents styles de tête de note disponibles. @lilypondfile[noindent]{note-head-style.ly} +@node Text markup commands +@appendixsec Text markup commands +@translationof Text markup commands + Les commandes suivantes peuvent être utilisées dans un bloc @code{\markup @{ @}}. @include markup-commands.tely +@node Text markup list commands +@appendixsec Text markup list commands +@translationof Text markup list commands + Les commandes suivantes peuvent être utilisées dans un bloc @code{\markuplines @{ @}}. diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely index 7fdbe53ae5..e803e38f48 100644 --- a/Documentation/notation/notation-appendices.itely +++ b/Documentation/notation/notation-appendices.itely @@ -13,24 +13,6 @@ @node Notation manual tables @appendix Notation manual tables -@c Please do not delete the following @ignore block. -@ignore -Note for editors and translators: In the following menu, two entries -are needed to link to a pair of automatically generated sections. -Please keep them and, if using emacs, do not run -texinfo-all-menus-update without manually restoring them back. These -menu entries are: - -* Text markup commands:: -* Text markup list commands:: - -and they should go just after -* Note head styles:: - -and just before -* List of articulations:: -@end ignore - @menu * Chord name chart:: * Common chord modifiers:: @@ -853,10 +835,21 @@ The following styles may be used for note heads. @lilypondfile[noindent]{note-head-style.ly} + +@node Text markup commands +@appendixsec Text markup commands + @include markup-commands.tely + +@node Text markup list commands +@appendixsec Text markup list commands + +The following commands can all be used with @code{\markuplines}: + @include markup-list-commands.tely + @node List of articulations @appendixsec List of articulations diff --git a/scm/document-markup.scm b/scm/document-markup.scm index f8b9520e71..860ece38b6 100644 --- a/scm/document-markup.scm +++ b/scm/document-markup.scm @@ -95,18 +95,6 @@ (sort markup-functions markup-function #:appendix #t @@ -125,11 +113,16 @@ raw-categories)))) (map markup-category-doc-node categories)))) -(define (markup-list-doc-node) - (make - #:appendix #t - #:name "Text markup list commands" - #:desc "" - #:text (string-append - "The following commands can all be used with @code{\\markuplines}.\n" - (markup-list-doc-string)))) +(define (markup-list-doc-string) + (string-append + "@table @asis" + (apply string-append + (map doc-markup-function + (sort (hash-fold (lambda (markup-list-function dummy functions) + (cons markup-list-function functions)) + '() + markup-list-functions) + markup-function