From: Graham Percival Date: Sat, 15 Sep 2007 20:02:08 +0000 (-0700) Subject: More simplification, fixes. X-Git-Tag: release/2.11.35-1~46^2~168 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c3348dc80f7c9459495c87ba0e4b7462bd5b7c0a;hp=c6353d960e84a5ff11c480df498b80d14831c529;p=lilypond.git More simplification, fixes. --- diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 9c06d397a3..5ef01312bb 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -6,6 +6,10 @@ version that you are working on. See TRANSLATION for details. @end ignore +@c we need this since @q{\} doesn't work with makeinfo 4.8 -- +@c say @q{@value{backslash}} instead +@set backslash \ + @c **** format-independant **** @@ -36,19 +40,19 @@ @c use inside the text -@macro context{NAME} -@vindex \NAME\ -@code{\NAME\}@c should use internalsref +@macro context{TEXT} +@vindex \TEXT\ +@code{\TEXT\}@c should use internalsref @end macro -@macro refcommand{WHAT} -@vindex \WHAT\ -@code{\WHAT\} +@macro refcommand{TEXT} +@vindex \TEXT\ +@code{\TEXT\} @end macro -@macro funindex {WORD} -@findex \WORD\ -@kindex \WORD\ +@macro funindex {TEXT} +@findex \TEXT\ +@kindex \TEXT\ @end macro @@ -57,69 +61,113 @@ @c Use inside the text +@c to get decent quotes in `foo' +@macro q{TEXT} +@ifinfo +`\TEXT\' +@end ifinfo +@iftex +`\TEXT\' +@end iftex +@ifhtml +@html +‘\TEXT\’ +@end html +@end ifhtml +@ignore +@ifdocbook +@xml +‘\TEXT\’ +@end xml +@end docbook +@end ignore +@end macro + + +@c to get decent quotes in ``foo'' +@macro qq{TEXT} +@ifinfo +``\TEXT\'' +@end ifinfo +@iftex +``\TEXT\'' +@end iftex +@ifhtml +@html +“\TEXT\” +@end html +@end ifhtml +@ignore +@ifdocbook +@xml +“\TEXT\” +@end xml +@end docbook +@end ignore +@end macro + + + + @c usage: @lsr{ancient,custodes.ly} -@macro lsr{DIR,NAME} +@macro lsr{DIR,TEXT} @ifhtml - @uref{source/input/lsr/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}} +@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}} @end ifhtml @ifnothtml - @file{\DIR\/\NAME\} +@file{\DIR\/\TEXT\} @end ifnothtml @end macro @macro lsrdir{DIR} @ifhtml - @uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/} +@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/} @end ifhtml @ifnothtml - @file{\DIR\} +@file{\DIR\} @end ifnothtml @end macro -@c we need this since @q{\} doesn't work with makeinfo 4.8 -- -@c say @q{@value{backslash}} instead -@set backslash \ - @ifhtml @c ***** HTML ***** @c makeinfo-4.7 encodes html names, which means that nodes that @c contain nonalphanum characters will be broken links on the website. -@c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c +@c @uref{../lilypond-internals/\TEXT\.html,\TEXT\}@c @c @inforef{} adds ``See'' to the sentence, which is annoying, but @c better than a broken link. -@c @inforef{\NAME\,,lilypond-internals}@c +@c @inforef{\TEXT\,,lilypond-internals}@c @c using @ref without punctuation is OK without for formats other than info @ifset bigpage -@macro internalsref{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-internals-big-page} +@macro internalsref{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals-big-page} @end macro -@macro rglos{NAME} -@vindex \NAME\ -@ref{\NAME\,,,music-glossary-big-page} +@macro rglos{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,music-glossary-big-page} @end macro -@macro rprogram{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-program-big-page} +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program-big-page} @end macro -@macro ruser{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-big-page} +@macro ruser{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-big-page} @end macro -@macro rlearning{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-learning-big-page} +@macro rlearning{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-learning-big-page} @end macro @end ifset @@ -127,92 +175,62 @@ @ifclear bigpage -@macro internalsref{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-internals} +@macro internalsref{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals} @end macro -@macro rglos{NAME} -@vindex \NAME\ -@ref{\NAME\,,,music-glossary} +@macro rglos{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,music-glossary} @end macro -@macro rprogram{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-program} +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program} @end macro -@macro ruser{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond} +@macro ruser{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond} @end macro -@macro rlearning{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-learning} +@macro rlearning{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-learning} @end macro @end ifclear - -@c to get decent quotes in `foo' -@macro q{TEXT} -@html -‘\TEXT\’ -@end html -@end macro - -@c to get decent quotes in ``foo'' -@macro qq{TEXT} -@html -“\TEXT\” -@end html -@end macro - @end ifhtml @ifdocbook @c ***** DOCBOOK-XML ***** -@macro internalsref{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-internals} -@end macro - -@macro rglos{NAME} -@vindex \NAME\ -@ref{\NAME\,,,music-glossary} -@end macro - -@macro rprogram{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-program} +@macro internalsref{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals} @end macro -@macro ruser{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond} +@macro rglos{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,music-glossary} @end macro -@macro rlearning{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-learning} +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program} @end macro -@c to get decent quotes in `foo' -@c to get decent quotes in `foo' -@macro q{TEXT} -@xml -‘\TEXT\’ -@end xml +@macro ruser{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond} @end macro -@c to get decent quotes in ``foo'' -@macro qq{TEXT} -@xml -“\TEXT\” -@end xml +@macro rlearning{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-learning} @end macro @end ifdocbook @@ -221,48 +239,37 @@ @ifinfo @c **** INFO **** -@macro internalsref{NAME} -@vindex \NAME\ -@inforef{\NAME\,,lilypond-internals} -@end macro - -@macro rglos{NAME} -@vindex \NAME\ -@inforef{\NAME\,,music-glossary} +@macro internalsref{TEXT} +@vindex \TEXT\ +@inforef{\TEXT\,,lilypond-internals} @end macro -@macro usermanref{NAME} -@inforef{\NAME\} +@macro rglos{TEXT} +@vindex \TEXT\ +@inforef{\TEXT\,,,music-glossary} @end macro -@macro learningref{NAME} -@inforef{\NAME\} +@macro usermanref{TEXT} +@inforef{\TEXT\} @end macro -@macro rprogram{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-program} +@macro learningref{TEXT} +@inforef{\TEXT\} @end macro -@macro ruser{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond} +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program} @end macro -@macro rlearning{NAME} -@vindex \NAME\ -@ref{\NAME\,,,lilypond-learning} -@end macro - -@c to get decent quotes in `foo' -@c to get decent quotes in `foo' -@macro q{TEXT} -`\TEXT\' +@macro ruser{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond} @end macro -@c to get decent quotes in ``foo'' -@macro qq{TEXT} -``\TEXT\'' +@macro rlearning{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-learning} @end macro @end ifinfo @@ -271,62 +278,52 @@ @c **** TEX **** @iftex -@macro internalsref{NAME} -@vindex \NAME\ -@code{\NAME\} +@macro internalsref{TEXT} +@vindex \TEXT\ +@code{\TEXT\} @end macro -@macro rglos {NAME} -@vindex \NAME\ -@code{\NAME\} +@macro rglos {TEXT} +@vindex \TEXT\ +@code{\TEXT\} @end macro -@macro seeinternals{NAME} -internals document, @internalsref{\NAME\} +@macro seeinternals{TEXT} +internals document, @internalsref{\TEXT\} @end macro -@macro usermanref{NAME} -user manual, @internalsref{\NAME\} +@macro usermanref{TEXT} +user manual, @internalsref{\TEXT\} @end macro -@macro learningref{NAME} -learning manual, @internalsref{\NAME\} +@macro learningref{TEXT} +learning manual, @internalsref{\TEXT\} @end macro -@macro rprogram{NAME} -program usage manual, @internalsref{\NAME\} +@macro rprogram{TEXT} +program usage manual, @internalsref{\TEXT\} @end macro @alias ruser=usermanref @alias rlearning=learningref -@c to get decent quotes in `foo' -@macro q{TEXT} -`\TEXT\' -@end macro - -@c to get decent quotes in ``foo'' -@macro qq{TEXT} -``\TEXT\'' -@end macro - @end iftex @ifnottex @c **** not TEX **** -@macro seeinternals{NAME} -@internalsref{\NAME\} +@macro seeinternals{TEXT} +@internalsref{\TEXT\} @end macro @ifnotinfo -@macro usermanref{NAME} -@ref{\NAME\} +@macro usermanref{TEXT} +@ref{\TEXT\} @end macro -@macro learningref{NAME} -@ref{\NAME\} +@macro learningref{TEXT} +@ref{\TEXT\} @end macro @end ifnotinfo diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index d37576c37e..0171abcb5f 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -134,9 +134,10 @@ The resulting PDF file will be displayed on your screen. Be warned that the first time you ever run LilyPond, it will take a minute or two because all of the system fonts have to be analyzed first. -For future use of LilyPond, you should begin by selecting @q{New} -or @q{Open}. You must save your file before typesetting it. If any errors -occur in processing, please see the log window. +For future use of LilyPond, you should begin by +selecting @q{New} or @q{Open}. You must save your file before +typesetting it. If any errors occur in processing, please see the log +window. @subsubheading Windows @@ -365,7 +366,7 @@ Here is a small example showing all these elements together: } @end lilypond -@seeals +@seealso @quotation @table @asis @item Entering pitches and durations @@ -525,7 +526,7 @@ c2 fis c2 ges @end lilypond -@seeals +@seealso @quotation @table @asis @item Relative octaves @@ -613,7 +614,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. -@seeals +@seealso @quotation @table @asis @item Accidentals @@ -675,7 +676,7 @@ can be nested. c2~( c8 fis fis4 ~ fis2 g2) @end lilypond -@seeals +@seealso @quotation @table @asis @item Ties @@ -741,7 +742,7 @@ Crescendi and decrescendi are started with the commands @code{\<} and c2\< c2\ff\> c2 c2\! @end lilypond -@seeals +@seealso @quotation @table @asis @item Articulations @@ -773,7 +774,7 @@ with @samp{]}. a8[ ais] d[ ees r d] a b @end lilypond -@seeals +@seealso @quotation @table @asis @item Automatic beams @@ -832,7 +833,7 @@ c2 \appoggiatura b16 c2 c2 \acciaccatura b16 c2 @end lilypond -@seeals +@seealso @quotation @table @asis @item Grace notes @@ -1042,7 +1043,7 @@ Here is a small example } @end lilypond -@seeals +@seealso @quotation See @ruser{Piano music}. @end quotation @@ -1122,7 +1123,7 @@ Again, these expressions can be nested arbitrarily. >> @end lilypond -@seeals +@seealso @quotation See @ruser{Basic polyphony}. @end quotation @@ -1197,7 +1198,7 @@ resulting in a centered hyphen between two syllables >> @end lilypond -@seeals +@seealso @quotation More options, such as putting multiple stanzas below a melody, are discussed in @ruser{Vocal music}. @@ -1253,7 +1254,7 @@ a lead sheet, @end lilypond -@seeals +@seealso @quotation A complete list of modifiers and other options for layout can be found in @ruser{Chords}.