X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fmacros.itexi;h=c1b4cf442beffb96df34532432eb4b882b0899d6;hb=3d04206a83222e89d99ddf1a0766b6b74f158967;hp=eef33e29cc0553dd31bce7c934230c624411b37c;hpb=01105e2a179bbf14da0923f7e1f4093cd9bcd8c5;p=lilypond.git diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index eef33e29cc..c1b4cf442b 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 - - +@c -*- coding: latin-1; mode: texinfo; -*- +@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,124 +22,182 @@ @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 ***** -@c center*** is broken? +@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? +@findex \NAME\ +@end macro -@ifinfo -@macro separate -@quotation -@end quotation -@end macro -@end ifinfo + @macro inputfileref{DIR,NAME} + @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c + @end macro -@ifhtml -@macro separate -@html -