Doc: minor tweaks to tutorial text.

[lilypond.git] / Documentation / macros.itexi

diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index f9077706e1c280c6c1f8a11025c43cb3a08564c6..2ffeacdf693c23984ea88637a190e1fadef8d3ed 100644 (file)
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -31,6 +31,8 @@
 <div class="warning">
 @end html
 @strong{Note:} \TEXT\
+@c keep the space for proper nesting of </p>
+
 @html
 </div>
 @end html
@@ -57,7 +59,7 @@
 @cartouche
 For more information about how this manual fits with the other
 documentation, or to read this manual in other formats, see
-@rgeneral{Manuals}.
+@rweb{Manuals}.
 
 If you are missing any manuals, the complete documentation can be
 found at @w{@uref{http://@/www@/.lilypond@/.org/}}.
@@ -70,11 +72,11 @@ found at @w{@uref{http://@/www@/.lilypond@/.org/}}.
 @syncodeindex fn cp
 @syncodeindex vr cp
 
-@afourpaper
 
+@c   ***** Copyright stuff *****
+@ifset FDL
 @copying
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009 by the authors.
+@copyrightDeclare
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -85,9 +87,17 @@ A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
 @end quotation
 @end copying
+@end ifset
+
+@ifclear FDL
+@copying
+This document has been placed in the public domain.
+@end copying
+@end ifclear
 
 
-@c TITLE PAGE
+
+@c   ***** Title page *****
 @ifnottex
 @node Top
 @top LilyPond --- \TITLE\
@@ -174,7 +184,7 @@ For LilyPond version @version{}
 
 @c  Definitions for references:
 @c
-@c     @rgeneral
+@c     @rweb
 @c     @ressay
 @c     @rglos
 @c     @rinternals
@@ -183,6 +193,7 @@ For LilyPond version @version{}
 @c     @rprogram
 @c     @ruser
 @c     @rchanges
+@c     @rextend
 @c     @rcontrib
 @c
 @c  All these also have a @...named version which allows to specify the
@@ -230,6 +241,16 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,notation-big-page,Notation Reference}
 @end macro
 
+@macro rextend{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,extending-big-page,Extending}
+@end macro
+
+@macro rextendnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,extending-big-page,Extending}
+@end macro
+
 @macro rchanges{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,changes-big-page,Changes}
@@ -250,14 +271,14 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,contributor-big-page,Contributor's Guide}
 @end macro
 
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,general-big-page,General Information}
+@ref{\TEXT\,,,web-big-page,General Information}
 @end macro
 
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,general-big-page,General Information}
+@ref{\TEXT\,,\DISPLAY\,web-big-page,General Information}
 @end macro
 
 @macro ressay{TEXT}
@@ -272,12 +293,12 @@ For LilyPond version @version{}
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,application-big-page,Application Usage}
+@ref{\TEXT\,,,usage-big-page,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,application-big-page,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,usage-big-page,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
@@ -347,6 +368,16 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,changes,Changes}
 @end macro
 
+@macro rextend{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,extending,Extending}
+@end macro
+
+@macro rextendnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,extending,Extending}
+@end macro
+
 @macro rcontrib{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,contributor,Contributor's Guide}
@@ -357,14 +388,14 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,contributor,Contributor's Guide}
 @end macro
 
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,general,General Information}
+@ref{\TEXT\,,,web,General Information}
 @end macro
 
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,general,General Information}
+@ref{\TEXT\,,\DISPLAY\,web,General Information}
 @end macro
 
 @macro ressay{TEXT}
@@ -379,12 +410,12 @@ For LilyPond version @version{}
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,application,Application Usage}
+@ref{\TEXT\,,,usage,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,usage,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
@@ -449,6 +480,16 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,lilypond-changes,Changes}
 @end macro
 
+@macro rextend{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-extending,Extending}
+@end macro
+
+@macro rextendnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-extending,Extending}
+@end macro
+
 @macro rcontrib{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-contributor,Contributor's Guide}
@@ -459,14 +500,14 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,lilypond-contributor,Contributor's Guide}
 @end macro
 
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-general,General Information}
+@ref{\TEXT\,,,lilypond-web,General Information}
 @end macro
 
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-general, General Information}
+@ref{\TEXT\,,\DISPLAY\,lilypond-web, General Information}
 @end macro
 
 @macro ressay{TEXT}
@@ -481,12 +522,12 @@ For LilyPond version @version{}
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-application,Application Usage}
+@ref{\TEXT\,,,lilypond-usage,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-application,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,lilypond-usage,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
@@ -525,7 +566,7 @@ For LilyPond version @version{}
 @c delimits arguments in the standard way (i.e., with braces).
 
 @tex
-\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+\gdef\lilyvindex#1{\doind{vr}{\code{#1}}\ignorespaces}
 @end tex
 
 @macro rglos{TEXT}
@@ -568,6 +609,16 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,changes,Changes}
 @end macro
 
+@macro rextend{TEXT}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,,extending,Extending}
+@end macro
+
+@macro rextendnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
+@ref{\TEXT\,,\DISPLAY\,extending,Extending}
+@end macro
+
 @macro rcontrib{TEXT}
 @lilyvindex{\TEXT\}
 @ref{\TEXT\,,,contributor,Contributor's Guide}
@@ -578,14 +629,14 @@ For LilyPond version @version{}
 @ref{\TEXT\,,\DISPLAY\,contributor,Contributor's Guide}
 @end macro
 
-@macro rgeneral{TEXT}
+@macro rweb{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,general,General Information}
+@ref{\TEXT\,,,web,General Information}
 @end macro
 
-@macro rgeneralnamed{TEXT,DISPLAY}
+@macro rwebnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,general,General Information}
+@ref{\TEXT\,,\DISPLAY\,web,General Information}
 @end macro
 
 @macro ressay{TEXT}
@@ -600,12 +651,12 @@ For LilyPond version @version{}
 
 @macro rprogram{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,application,Application Usage}
+@ref{\TEXT\,,,usage,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,usage,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}