Build: un-nodify markup-*-commands.tely

diff --git a/Documentation/de/notation/notation-appendices.itely b/Documentation/de/notation/notation-appendices.itely
index 1fb8c1f7c3b16461e4168988a0c0a7ad730767d6..6a66586a600b423bf22cc4459d9f7742fabdba5a 100644 (file)
--- 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 56ec5ac88d32c120bf7939c001e1a31b92a465b9..5cacd4d3d06234fc288e63a498804f8060fc898d 100644 (file)
--- 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 a9c1cfa494f69f84d0df545d128443c7c8c260d2..dbdb32b72a5d4d1532d255c9aaa3c9cc30d0681b 100644 (file)
--- 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 7fdbe53ae5678b0d7c5b00c5eab17cc2a5dc3fb9..e803e38f481f4d057524713e61b89c2122a53bab 100644 (file)
--- 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 f8b9520e719f94a1aae039b67cbc7e00706e8369..860ece38b6c8e73e5e389c07fd482ffb2d7e506b 100644 (file)
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -95,18 +95,6 @@
                           (sort markup-functions markup-function<?)))
               "\n@end table"))))
 
-(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<?)))
-   "\n@end table"))
-
 (define (markup-doc-node)
   (make <texi-node>
     #:appendix #t
@@ -125,11 +113,16 @@
                                                   raw-categories))))
                  (map markup-category-doc-node categories))))
 
-(define (markup-list-doc-node)
-  (make <texi-node>
-    #: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<?)))
+   "\n@end table"))
+
+

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 0e6cfe32bed7fd64a75b2a3bc497e9e47f12ea96..ea13b7e04c10cb4c9a9153050717bed1abb92db3 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -47,13 +47,22 @@
 ;; (markup-doc-string)
 ;; (open-output-file "markup-commands.tely"))
 
-(call-with-output-file "markup-commands.tely"
-  (lambda (port)
-    (dump-node (markup-doc-node) port 2)))
+(display
+ ;; ugly hack to remove the @node... @appendixsec... portion
+ (substring
+  (call-with-output-string
+   (lambda (port)
+     (dump-node (markup-doc-node) port 2)))
+  ;; magic number to remove the initial part.  63 comes from:
+  ;; "\nnode Text markup commands\n@appendixsec Text markup commands\n\n\n\n"
+  ;; which is generated by (dump-node...) in documentation-lib.scm
+  63
+  )
+ (open-output-file "markup-commands.tely"))
 
-(call-with-output-file "markup-list-commands.tely"
-  (lambda (port)
-    (dump-node (markup-list-doc-node) port 2)))
+(display
+ (markup-list-doc-string)
+ (open-output-file "markup-list-commands.tely"))
 
 (display
  type-predicates-doc-string