-@c -*- coding: latin-1; mode: texinfo; -*-
-
-@ifnottex
- @macro texisharp {word}
- #
- @end macro
- @macro texiflat {word}
- b
- @end macro
-@end ifnottex
-
-@c FIXME, use \fetaaccidentalsXMC?
-@c \\kern0.15em\\fetachar\\fetaflat
-@iftex
- @macro texiflat {word}
- @tex
- FIXME: fetaflat
- @end tex
- @end macro
-@c FIXME, use \fetaaccidentalsXC?
-@c \\raise0.5ex\\fetachar\\fetasharp
- @macro texisharp {word}
- @tex
- FIXME: fetasharp
- @end tex
- @end macro
-@end iftex
+@c -*- coding: us-ascii; mode: texinfo; -*-
+@ignore
+ Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+ When revising a translation, copy the HEAD committish of the
+ version that you are working on. See TRANSLATION for details.
+@end ignore
+
+@c ***** Displaying text *****
+
+@c we need this since @q{\} doesn't work with makeinfo 4.8 --
+@c say @q{@value{backslash}} instead
+@set backslash \
+
+@c to get decent quotes in `foo' and ``foo''
+@macro q{TEXT}
+@quoteleft{}\TEXT\@quoteright{}
+@end macro
+
+@macro qq{TEXT}
+@quotedblleft{}\TEXT\@quotedblright{}
+@end macro
+
+@macro warning{TEXT}
+@quotation
+@quotation
+@cartouche
+@b{Note:} \TEXT\
+@end cartouche
+@end quotation
+@end quotation
+@end macro
+
+@ifnotinfo
+@macro notation{TEXT}
+@var{\TEXT\}
+@end macro
+@end ifnotinfo
-@macro arrow{}
-@iftex
-@tex $\\Rightarrow$ @end tex@c
-@end iftex
-@ifhtml
-@html
-→
-@end html
-@end ifhtml
@ifinfo
--->
+@macro notation{TEXT}
+\TEXT\
+@end macro
@end ifinfo
+
+@macro smallspace
+@sp 1
@end macro
-@ifhtml
-@c ***** HTML *****
+@c **** Displaying images not generated by lilypond-book
-@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 @inforef{} adds ``See'' to the sentence, which is annoying, but
-@c better than a broken link.
-@c @inforef{\NAME\,,lilypond-internals}@c
-@c using @ref without punctuation is OK without for formats other than info
+@c current installation setup of Info docs requires that all images are
+@c expected to be found in lilypond/ subdirectory. lilypond-book already
+@c generates proper @image commands for images of music; these macros
+@c definitions do the same for other images.
-@macro internalsref{NAME}@c
-@c annoying parentheses stripped by add-html-footer.py
-@ref{\NAME\,,,lilypond-internals}@c
-@findex \NAME\
+@ifnotinfo
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
@end macro
+@end ifnotinfo
-@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@ifinfo
+@macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT}
+@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\}
@end macro
+@end ifinfo
+
+
+@c **** Headings in a doc subsection ****
-@macro rglos{NAME}@c
-@c annoying parentheses stripped by add-html-footer.py
-@ref{\NAME\,,,music-glossary}@c
-@findex \NAME\
+@c obsolete; being removed.
+@macro refcommands
+@noindent
+@subsubheading Predefined commands
+
+@end macro
+
+@macro commonprop
+@noindent
+@c @subsubheading Commonly tweaked properties
+@subsubheading Selected Snippets
+
+@end macro
+
+@macro seealso
+@noindent
+@subsubheading See also
+
+@indent
@end macro
-
+
+@macro refbugs
+@noindent
+@subsubheading Known issues and warnings
+
+@end macro
+
+
+@macro funindex {TEXT}
+@findex \TEXT\
+@kindex \TEXT\
+@end macro
+
+
+
+@c **** Links and references ****
+
+@c usage: @lsr{ancient,Ancient-notation,custodes.ly}
+@macro lsr{SECTION,DIR,TEXT}
+@ifhtml
+@uref{source/input/lsr/snippets/\DIR\.html#\TEXT\,@file{\SECTION\/\TEXT\}}
@end ifhtml
+@ifnothtml
+@file{\SECTION\/\TEXT\}
+@end ifnothtml
+@end macro
+@c usage: @lsrdir{ancient,Ancient-notation}
+@macro lsrdir{SECTION,DIR}
+@ifhtml
+@uref{source/input/lsr/snippets/\DIR\.html,\SECTION\}
+@end ifhtml
+@ifnothtml
+\DIR\
+@end ifnothtml
+@end macro
-@ifdocbook
-@c ***** DOCBOOK-XML *****
-@macro internalsref{NAME}
-@ref{\NAME\,,,lilypond-internals}@c
-@findex @code{\NAME\}
+@c Definitions for references:
+@c @internalsref
+@c @rglos
+@c @rprogram
+@c @ruser
+@c @rlearning
+
+@ifhtml
+@c ***** HTML *****
+
+@ifset bigpage
+
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals-big-page}
@end macro
-
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary-big-page}
@end macro
-@macro rglos{NAME}@c
-@ref{\NAME\,,,music-glossary}@c
-@findex \NAME\
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page}
@end macro
-@end ifdocbook
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-big-page}
+@end macro
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning-big-page}
+@end macro
+
+@end ifset
-@ifinfo
-@c **** INFO ****
-@macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}@c
-@findex \NAME\@c
+@ifclear bigpage
+
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
@end macro
-@macro inputfileref{DIR,NAME}
-@file{\DIR\/\NAME\}
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
@end macro
-@macro rglos{NAME}@c
-@inforef{\NAME\,,,music-glossary}@c
-@findex \NAME\
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
@end macro
-@macro usermanref{NAME}
-@inforef{\NAME\}@c
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
@end macro
-@end ifinfo
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
+@end macro
+@end ifclear
-@c **** TEX ****
-@iftex
+@end ifhtml
+
+
+@ifdocbook
+@c ***** DOCBOOK-XML *****
-@macro internalsref{NAME}@c
-@findex \NAME\ @c
-@code{\NAME\}@c
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals}
@end macro
-@macro inputfileref{DIR,NAME}@c
-@file{\DIR\/@/\NAME\}@c
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
@end macro
-@macro rglos {NAME}
-@findex \NAME\ @c
-@code{\NAME\}@c
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
@end macro
-@macro seeinternals{NAME}
-internals document, @internalsref{\NAME\}
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
@end macro
-@macro usermanref{NAME}
-user manual, @internalsref{\NAME\}
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
@end macro
-@end iftex
+@end ifdocbook
-@ifnottex
-@c **** not TEX ****
-@macro seeinternals{NAME}
-@internalsref{\NAME\}
+@ifinfo
+@c **** INFO ****
+
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@inforef{\TEXT\,,lilypond-internals}
@end macro
-@ifnotinfo
-@macro usermanref{NAME}
-@ref{\NAME\}@c
+@macro rglos{TEXT}
+@vindex \TEXT\
+@inforef{\TEXT\,,music-glossary}
@end macro
-@end ifnotinfo
-@end ifnottex
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program}
+@end macro
-@macro refbugs
-@noindent
-@subsubheading Bugs
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond}
+@end macro
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-learning}
@end macro
-@macro seealso
-@noindent
-@subsubheading See also
+@end ifinfo
+
+@c **** TEX ****
+@iftex
+
+@macro internalsref{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
@end macro
-@macro refcommands
-@noindent
-@subsubheading Predefined commands
+@macro rglos {TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary}
+@end macro
+@macro rprogram{TEXT}
+program usage manual, @ref{\TEXT\,,,lilypond-program}
+@c @internalsref{\TEXT\}
@end macro
-@macro context{NAME}@c
-@code{\NAME\}@c should use internalsref
-@findex \NAME\@c
+@macro ruser{TEXT}
+notation reference, @ref{\TEXT\,,,lilypond}
+@c @internalsref{\TEXT\}
@end macro
-@macro refcommand{WHAT}
-@findex \WHAT\
-@code{\WHAT\}
+@macro rlearning{TEXT}
+learning manual, @ref{\TEXT\,,,lilypond-learning}
+@c @internalsref{\TEXT\}
@end macro
+@end iftex
+
+
+@c EOF