X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fmacros.itexi;h=4cf09a6c6bc77ffe0fe57258bd920a9aceb349bf;hb=c0c44065077dff178292940b361b665eed613615;hp=b1435de21ca6c5f48a5db873def234ab765f1155;hpb=a54eded7c9ae0fa7dd70bfd2fbdb506502513c17;p=lilypond.git diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index b1435de21c..4cf09a6c6b 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -1,23 +1,19 @@ @c -*-texinfo-*- -@c Only reference in HTML. -@macro htmlref {NAME} -@ifhtml -@ref{\NAME\}@c -@end ifhtml -@ifnothtml -\NAME\@c -@end ifnothtml -@end macro - - - +@tex +\input feta20.tex +\global\font\fetasixteen=feta16 +\gdef\fetafont{\fetasixteen} +\gdef\fetachar#1{\hbox{\fetasixteen#1}} +@end tex @c Reference GLOSsary @macro rglos {NAME} @ifhtml @c ugh: @ref assumes that external refs are split documents too -@uref{../music-glossary.html#\NAME\,\NAME\}@c +@html +\NAME\@c +@end html @end ifhtml @ifnothtml \NAME\@c @@ -26,107 +22,202 @@ @ifnottex -@macro texisharp {word} -# -@end macro + @macro texisharp {word} + # + @end macro + @macro texiflat {word} + b + @end macro @end ifnottex @iftex -@macro texisharp {word} -@tex -$\\sharp$% -@end tex -@end macro + @macro texiflat {word} + @tex + \\kern0.15em\\fetachar\\fetaflat + @end tex + @end macro + @macro texisharp {word} + @tex + \\raise0.5ex\\fetachar\\fetasharp + @end tex + @end macro @end iftex -@ifnottex -@macro texiflat {word} -b -@end macro -@end ifnottex +@macro arrow{} @iftex -@macro texiflat {word} -@tex -$\\flat$% -@end tex -@end macro +@tex $\\Rightarrow$ @end tex@c @end iftex +@ifhtml +@html +→ +@end html +@end ifhtml +@ifinfo +--> +@end ifinfo +@end macro -@iftex -@macro separate -@c I want some space over here, not silly characters. -@tex -@end tex -@end macro -@end iftex +@c dup? +@ifhtml -@c \heartsf was supposed to be filled? + @c ***** HTML ***** + +@macro internalsref{NAME}@c +@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 +@ref{\NAME\,,,lilypond-internals}@c +@c should we do this? +@cindex @code{\NAME\} +@end macro + + @c what is this? -- jcn + @macro hyphenatedinternalsref{NAME,NODENAME} + @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c + @c @inforef{\NODENAME\,,lilypond-internals}@c + @c should we do this? + @c using @ref without punctuation is OK without for formats other than info + @ref{\NODENAME\,,\NAME\,lilypond-internals}@c + @cindex @code{\NAME\} + @end macro + + @macro inputfileref{DIR,NAME} + @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c + @end macro -@c center*** is broken? +@end ifhtml -@ifinfo -@macro separate +@c dup? +@ifdocbook -@quotation -@end quotation -@end macro -@end ifinfo + @c ***** DOCBOOK-XML ***** -@ifhtml -@macro separate -@html -