From c6353d960e84a5ff11c480df498b80d14831c529 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sat, 15 Sep 2007 12:39:13 -0700 Subject: [PATCH] Begin simplifying macros.itexi. --- Documentation/user/changing-defaults.itely | 8 ++--- Documentation/user/macros.itexi | 42 ++++++++-------------- Documentation/user/music-glossary.tely | 4 +-- Documentation/user/tutorial.itely | 22 ++++++------ 4 files changed, 31 insertions(+), 45 deletions(-) diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index c20c800e22..3e07a465b1 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -716,7 +716,7 @@ reference, see @internalsref{Contexts}. @end ifhtml @ifnothtml -Translation @arrow{} Context. +Translation @expansion{} Context. @end ifnothtml @c [TODO: describe propagation] @@ -981,7 +981,7 @@ program reference, see @internalsref{Tunable context properties}. @end ifhtml @ifnothtml -Translation @arrow{} Tunable context properties. +Translation @expansion{} Tunable context properties. @end ifnothtml @@ -1000,14 +1000,14 @@ For a full a description of each plug-in, see @internalsref{Engravers}. @end ifhtml @ifnothtml -Program reference @arrow Translation @arrow{} Engravers. +Program reference @expansion{} Translation @expansion{} Engravers. @end ifnothtml Every context described in @ifhtml @internalsref{Contexts} @end ifhtml @ifnothtml -Program reference @arrow Translation @arrow{} Context. +Program reference @expansion{} Translation @expansion{} Context. @end ifnothtml lists the engravers used for that context. diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 61b8b4140d..9c06d397a3 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -6,16 +6,19 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c **** all formats **** -@macro refbugs +@c **** format-independant **** + +@c regions of a doc subsection +@macro refcommands @noindent -@subsubheading Bugs +@subsubheading Predefined commands @end macro -@macro moreinfo -@subheading More information +@macro commonprop +@noindent +@subsubheading Commonly tweaked properties @end macro @@ -25,12 +28,14 @@ @end macro -@macro refcommands +@macro refbugs @noindent -@subsubheading Predefined commands +@subsubheading Bugs @end macro + +@c use inside the text @macro context{NAME} @vindex \NAME\ @code{\NAME\}@c should use internalsref @@ -41,12 +46,6 @@ @code{\WHAT\} @end macro -@macro commonprop -@noindent -@subsubheading Commonly tweaked properties - -@end macro - @macro funindex {WORD} @findex \WORD\ @kindex \WORD\ @@ -56,6 +55,8 @@ @c *** Macros with variable output *** +@c Use inside the text + @c usage: @lsr{ancient,custodes.ly} @macro lsr{DIR,NAME} @ifhtml @@ -78,21 +79,6 @@ -@macro arrow{} -@iftex -@tex $\\Rightarrow$ @end tex@c -@end iftex -@ifhtml -@html -→ -@end html -@end ifhtml -@ifinfo ---> -@end ifinfo -@end macro - - @c we need this since @q{\} doesn't work with makeinfo 4.8 -- @c say @q{@value{backslash}} instead @set backslash \ diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 46e4a6b72a..ce272a9857 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -108,10 +108,10 @@ Copyright 1999--2007 by the authors @c arrowref @macro aref{word} @iftex -@w{@arrow{}@strong{\word\}}@c +@w{@expansion{}@strong{\word\}}@c @end iftex @ifnottex -@arrow{}@ref{\word\, @strong{\word\}}@c +@expansion{}@ref{\word\, @strong{\word\}}@c @end ifnottex @end macro diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 1eca10aec2..d37576c37e 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -365,7 +365,7 @@ Here is a small example showing all these elements together: } @end lilypond -@moreinfo +@seeals @quotation @table @asis @item Entering pitches and durations @@ -525,7 +525,7 @@ c2 fis c2 ges @end lilypond -@moreinfo +@seeals @quotation @table @asis @item Relative octaves @@ -613,7 +613,7 @@ accidentals can be printed according to different conventions. See @ruser{Automatic accidentals}, for some examples how accidentals can be printed according to different rules. -@moreinfo +@seeals @quotation @table @asis @item Accidentals @@ -675,7 +675,7 @@ can be nested. c2~( c8 fis fis4 ~ fis2 g2) @end lilypond -@moreinfo +@seeals @quotation @table @asis @item Ties @@ -741,7 +741,7 @@ Crescendi and decrescendi are started with the commands @code{\<} and c2\< c2\ff\> c2 c2\! @end lilypond -@moreinfo +@seeals @quotation @table @asis @item Articulations @@ -773,7 +773,7 @@ with @samp{]}. a8[ ais] d[ ees r d] a b @end lilypond -@moreinfo +@seeals @quotation @table @asis @item Automatic beams @@ -832,7 +832,7 @@ c2 \appoggiatura b16 c2 c2 \acciaccatura b16 c2 @end lilypond -@moreinfo +@seeals @quotation @table @asis @item Grace notes @@ -1042,7 +1042,7 @@ Here is a small example } @end lilypond -@moreinfo +@seeals @quotation See @ruser{Piano music}. @end quotation @@ -1122,7 +1122,7 @@ Again, these expressions can be nested arbitrarily. >> @end lilypond -@moreinfo +@seeals @quotation See @ruser{Basic polyphony}. @end quotation @@ -1197,7 +1197,7 @@ resulting in a centered hyphen between two syllables >> @end lilypond -@moreinfo +@seeals @quotation More options, such as putting multiple stanzas below a melody, are discussed in @ruser{Vocal music}. @@ -1253,7 +1253,7 @@ a lead sheet, @end lilypond -@moreinfo +@seeals @quotation A complete list of modifiers and other options for layout can be found in @ruser{Chords}. -- 2.39.5