From f9204a121a577cc2f5564f81d9ffeca30977e272 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 26 Sep 2002 13:02:18 +0000 Subject: [PATCH] * Documentation/user/refman.itely: * Documentation/user/tutorial.itely: * Documentation/user/music-glossary.tely: Merge changes. * Documentation/user/glossary.html.in: * Documentation/index.texi: * Documentation/header.html.in: Accomodate renaming of glossary. * Documentation/user/tutorial.itely: Add some glossary references. * Documentation/user/refman.itely: Minor fixes. * Documentation/user/lilypond.tely: Add glossary do direntry. * Documentation/user/music-glossary.tely: Rename (previously: glossary.tely). Fix anchor placement. * Documentation/user/GNUmakefile: Make music-glossary.info too. --- ChangeLog | 21 ++++++ Documentation/header.html.in | 2 +- Documentation/index.texi | 7 +- Documentation/user/GNUmakefile | 8 +-- Documentation/user/glossary.html.in | 9 +++ Documentation/user/lilypond.tely | 24 +++---- Documentation/user/macros.itexi | 64 +++++++++--------- .../{glossary.tely => music-glossary.tely} | 65 ++++++++++--------- Documentation/user/refman.itely | 2 + Documentation/user/tutorial.itely | 28 ++++---- 10 files changed, 131 insertions(+), 99 deletions(-) create mode 100644 Documentation/user/glossary.html.in rename Documentation/user/{glossary.tely => music-glossary.tely} (98%) diff --git a/ChangeLog b/ChangeLog index ed0c9ea142..eaf0152443 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2002-09-26 Jan Nieuwenhuizen + + * Documentation/user/refman.itely: + * Documentation/user/tutorial.itely: + * Documentation/user/music-glossary.tely: Merge changes. + + * Documentation/user/glossary.html.in: + * Documentation/index.texi: + * Documentation/header.html.in: Accomodate renaming of glossary. + + * Documentation/user/tutorial.itely: Add some glossary references. + + * Documentation/user/refman.itely: Minor fixes. + + * Documentation/user/lilypond.tely: Add glossary do direntry. + + * Documentation/user/music-glossary.tely: Rename (previously: + glossary.tely). Fix anchor placement. + + * Documentation/user/GNUmakefile: Make music-glossary.info too. + 2002-09-23 Werner Lemberg * scripts/lilypond-book.py (output_dict): Fix handling of diff --git a/Documentation/header.html.in b/Documentation/header.html.in index ed3939660c..5dbb7421d8 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -59,7 +59,7 @@ which substitutes some @AT_VARIABLES@ as well. Tutorial
Manual
- Glossary
+ Glossary
Index

 diff --git a/Documentation/index.texi b/Documentation/index.texi index 196d2968bf..327635afbf 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -86,12 +86,11 @@ The user @uref{../user/out-www/lilypond.html, manual in one big page}, for easy searching, or look it up in the @uref{../user/out-www/lilypond/Index.html,index}. -@c glossary maybe for new users? @item - A @uref{../user/out-www/glossary.html,glossary} of musical + A @uref{../user/out-www/music-glossary.html,glossary} of musical terms, including translations. (also in -@uref{../user/out-www/glossary.ps.gz,PostScript} and -@uref{../user/out-www/glossary.pdf,PDF}). Read this if you're not +@uref{../user/out-www/music-glossary.ps.gz,PostScript} and +@uref{../user/out-www/music-glossary.pdf,PDF}). Read this if you're not familiar with English terms for notation. @item Documentation of diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index a3f909f13a..b401365d15 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -17,17 +17,13 @@ PDF_FILES = $(DVI_FILES:.dvi=.pdf) PS_GZ_FILES= $(addsuffix .gz, $(PS_FILES)) -INFO_FILES = $(addprefix $(outdir)/, lilypond.info lilypond-internals.info) +INFO_DOCS = lilypond lilypond-internals music-glossary +INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info) STEPMAKE_TEMPLATES=tex texinfo documentation LOCALSTEPMAKE_TEMPLATES=lilypond ly LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly-set-option (quote internal-type-checking) \#t)"' -# Hmm, what about? -# local-dist: check-info - -info: # check-info # -> reinstate when actively hacking doco. - include $(depth)/make/stepmake.make # Ugh,ugh. diff --git a/Documentation/user/glossary.html.in b/Documentation/user/glossary.html.in new file mode 100644 index 0000000000..d0c91633f1 --- /dev/null +++ b/Documentation/user/glossary.html.in @@ -0,0 +1,9 @@ + + + + +

Music glossary has moved

+ +The new location is: music-glossary.html. + +

Please update your links. Sorry for the inconvenience. \ No newline at end of file diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index cbecdf53f0..640204fcf9 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -17,8 +17,8 @@ Distributions will want to install lilypond.info doing: @c ;; prepend GNU for dir, must be unique * GNU LilyPond: (lilypond). The GNU music typesetter. * ly2dvi: (lilypond)Invoking ly2dvi:: Titling LilyPond scores. -* convert-ly: (lilypond)Invoking convert-ly:: - Older LilyPond versions. +* Glossary: (music-glossary). Glossary of music terms. +* convert-ly: (lilypond)Invoking convert-ly:: Older LilyPond versions. * midi2ly: (lilypond)Invoking midi2ly:: Importing MIDI. * etf2ly: (lilypond)Invoking etf2ly:: Importing Finale. * abc2ly: (lilypond)Invoking abc2ly:: Importing ABC. @@ -29,6 +29,12 @@ Distributions will want to install lilypond.info doing: @end direntry +@ifhtml +This document is also available in @uref{../lilypond.ps.gz,gzipped +PostScript} and @uref{../lilypond.pdf,PDF}. +@end ifhtml + + @titlepage @title GNU LilyPond @subtitle The music typesetter @@ -47,11 +53,12 @@ Copyright @copyright{} 1999--2002 by the authors @end titlepage -@ifinfo +@c Han-Wen Nienhuys, Jan Nieuwenhuizen, Adrian Mariano, Tom Cato Amundsen. + +@ifnottex This file documents GNU LilyPond. -Copyright 1999 Han-Wen Nienhuys, Jan Nieuwenhuizen, Adrian Mariano -Tom Cato Amundsen. +Copyright 1999-2002 by the authors Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -60,18 +67,13 @@ Tom Cato Amundsen. A copy of the license is included in the section entitled ``GNU Free Documentation License''. -@end ifinfo +@end ifnottex @ifnottex @node Top @top -@ifhtml -This document is also available as a @uref{../lilypond.ps.gz,gzipped -postscript file} and @uref{../lilypond.pdf,PDF}. -@end ifhtml - @chapter GNU LilyPond --- The music typesetter This is the user manual for GNU LilyPond 1.6.0. diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index a2a5ccab68..e9b28b4749 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -1,3 +1,17 @@ +@c -*-texinfo-*- + +@c Only reference in HTML. +@macro htmlref {NAME} +@ifhtml +@ref{\NAME\}@c +@end ifhtml +@ifnothtml +\NAME\@c +@end ifnothtml +@end macro + + +@c Reference ENGraver description @ifnottex @macro reng {word} @ref{ (lilypond-internals)\word\, \word\ } @@ -12,6 +26,7 @@ @end iftex +@c Reference GROB description @ifnottex @macro rgrob {word} @ref{ (lilypond-internals)\word\, \word\ } @@ -26,6 +41,7 @@ @end iftex +@c Reference INTernals document @ifnottex @macro rint {word} @ref{ (lilypond-internals)\word\, \word\ } @@ -39,6 +55,19 @@ @end macro @end iftex + +@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 +@end ifhtml +@ifnothtml +\NAME\@c +@end ifnothtml +@end macro + + @ifnottex @macro texisharp {word} # @@ -97,41 +126,8 @@ $\\flat$% @end macro @end ifhtml -@ignore - -@c Huh, do outline mode and texinfo really fight eachother? -@c Outline can only use spaces to indent topic headers -@c (or bullets, but then topics can't start with `@c'). -@c Texinfo can't have spaces in macro names. - -@macro c_ {word} -\word\ -@node \word\ -@section \word\ -@end macro - -@macro c__ {word} -\word\ -@menu -* \word\:: -@end menu - -@node \word\ -@subsection \word\ -@end macro - -@macro c___ {word} -\word\ -@node \word\ -@unnumberedsubsubsection \word\ -@end macro - -@macro c_ {word} -@end macro - -@end ignore - +@c dup? @ifhtml @macro internalsref{NAME} @uref{../lilypond-internals/\NAME\.html,\NAME\} diff --git a/Documentation/user/glossary.tely b/Documentation/user/music-glossary.tely similarity index 98% rename from Documentation/user/glossary.tely rename to Documentation/user/music-glossary.tely index 62d9adae9b..1e8a542452 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @settitle Music Glossary -@setfilename glosssary.info +@setfilename music-glosssary.info @html @@ -84,9 +84,17 @@ they look too intrusive (says Han-Wen). @c If we want hypelinks, we must add anchors. +@c Hmm, we need the @achor command in the item description itself +@c (not before or after) to get mozilla jump to the right place. @c anchoritem @macro aitem{word} -@anchor{\word\}@item \word\ +@item \word\@anchor{\word\} +@end macro +@macro aitemii{one,two} +@item \one\; \two\@anchor{\one\; \two\}@anchor{\one\} +@end macro +@macro aitemiii{one,two,three} +@item \one\; \two\; \three\@anchor{\one\; \two\; \three\}@anchor{\one\} @end macro @@ -394,8 +402,7 @@ DK: h, S: h, N: h. -@aitem{backfall; forefall} -@anchor{backfall} +@aitemii{backfall,forefall} @aref{appoggiatura}. @aitem{bar line} @@ -748,8 +755,7 @@ N: ?. Use of tones extraneous to a @aref{diatonic scale} (minor, major). -@aitem{church mode; ecclesiastical mode} -@anchor{church mode}@anchor{ecclesiastical mode} +@aitemii{church mode,ecclesiastical mode} ES: modo eclesi@'astico, I: modo ecclesiastico, F: mode eccl@'esiastique, @@ -1050,7 +1056,7 @@ of a piano keybord are diatonic. The church modes are used in gregorial chant and pre baroque early music but also to some extent in newer jazz music. -@lilypond[13pt,notime] +@lilypond[13pt,notime,linewidth=110mm] \property Score.barNonAuto = ##t \property Score.LyricText \set #'font-style = #'large \property Score.TextScript \set #'font-style = #'large @@ -1188,7 +1194,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and } @end lilypond -@lilypond[13pt,notime,linewidth=110mm] +@lilypond[13pt,notime] \property Score.barNonAuto = ##t \property Score.LyricText \set #'font-style = #'large \property Score.TextScript \set #'font-style = #'large @@ -1250,8 +1256,7 @@ scale. Opposite of @aref{conjunct movement}. fis2 d4. \bar "||" } @end lilypond -@aitem{dissonant interval; dissonance} -@anchor{dissonant interval}@anchor{dissonance} +@aitemii{dissonant interval,dissonance} ES: intervalo disonante, disonancias, I: intervallo dissonante, dissonanza, F: dissonance, @@ -1653,8 +1658,7 @@ N: ?. The methodical use of fingers in the playing of instruments. -@aitem{flag; pennant} -@anchor{flag}@anchor{pennant} +@aitem{flag,pennant} ES: corchete, I: coda (uncinata), bandiera, F: crochet, @@ -1691,8 +1695,7 @@ N: ?. @aref{accidental}. -@aitem{forefall; backfall} -@anchor{forefall} +@aitemii{forefall,backfall} @aref{appoggiatura}. @aitem{forte} @@ -2143,8 +2146,7 @@ The seventh @aref{scale degree}, a @aref{semitone} below the tonic; so called because of its strong tendency to ``lead up'' (resolve upwards) to the tonic scale degree. -@aitem{ledger line; leger line} -@anchor{ledger line}@anchor{leger line} +@aitemii{ledger line,leger line} ES: l@'{@dotless{i}}neas adicionales, I: tagli addizionali, F: ligne suppl@'ementaire, @@ -2253,6 +2255,16 @@ Note value: double length of @aref{breve}. } @end lilypond +@aitemii{lyrics,song texts} +ES: ., +I: ., +F: ., +D: ., +NL: liedtekst, +DK: ., +S: ., +N: .. + @aitem{major interval} ES: intervalo mayor, I: intervallo maggiore, @@ -2490,8 +2502,7 @@ N: ?. @aref{ornament}. -@aitem{motive; motif} -@anchor{motive}@anchor{motif} +@aitemii{motive,motif} ES: tema, I: inciso, F: incise, @@ -2699,8 +2710,7 @@ N: ?. @aref{interval}. -@aitem{ornament; embellishment; accessory} -@anchor{ornament}@anchor{embellishment}@anchor{accessory} +@aitemiii{ornament,embellishment,accessory} ES: adorno, I: abbellimento, fioriture, F: agr@'ement, ornement, @@ -3545,8 +3555,7 @@ the underlaying (normal) pulse and the actual (abnormal) rhythm. } @end lilypond -@aitem{syntonic comma; dydimic comma} -@anchor{syntonic comma} +@aitemii{syntonic comma,dydimic comma} I: comma sintonico (o didimico), F: comma syntonique, D: syntonisches Komma, @@ -3661,8 +3670,7 @@ N: ?. @aref{note value}. -@aitem{thorough bass; figured bass} -@anchor{thorough bass} +@aitemii{thorough bass,figured bass} ES: bajo cifrado, I: basso continuo, basso numerato, F: basse chiffr@'ee, @@ -3705,8 +3713,7 @@ with figures designating the chief @aref{interval}s and > @end lilypond -@aitem{tie; bind} -@anchor{tie} +@aitemii{tie,bind} ES: ligadura de prolongaci@'on, I: legatura (di valore), F: liaison, @@ -3847,8 +3854,7 @@ N: ?. @aref{chord}. -@aitem{trill; shake} -@anchor{trill}@anchor{shake} +@aitemii{trill,shake} ES: trino, I: trillo, F: trille, tremblement, battement (cadence), @@ -3909,8 +3915,7 @@ N: ?. A two-pronged piece of steel used to indicate absolute pitch. Tuning forks give the international pitch for the tone @emph{a} (440 vibrations per second.) -@aitem{turn; gruppetto} -@anchor{turn}@anchor{gruppetto} +@aitemii{turn,gruppetto} ES: grupo, I: gruppetto, F: grupetto, diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 83447b1eea..fd0e190320 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -119,6 +119,8 @@ To use them, simply include the language specific init file. For example: @code{\include "english.ly"}. The available language files and the note names they define are: +@anchor{note name} +@anchor{note names} @example Note Names sharp flat nederlands.ly c d e f g a bes b -is -es diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 664528b190..b929fe7548 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -39,9 +39,9 @@ complex examples. @node First steps @section First steps -We start off by showing how very simple music is entered in -LilyPond: You get a note simply by typing its note name, from -@samp{a} through @samp{g}. So if you enter +We start off by showing how very simple music is entered in LilyPond: +you get a note simply by typing its @htmlref{note name}, from @samp{a} +through @samp{g}. So if you enter @example c d e f g a b @@ -59,7 +59,7 @@ We will continue with this format: First we show a snippet of input, then the resulting output. The length of a note is specified by adding a number, @samp{1} for a -whole note, @samp{2} for a half note, and so on: +@rglos{whole note}, @samp{2} for a @rglos{half note}, and so on: @example a1 a2 a4 a16 a32 @@ -71,7 +71,7 @@ a1 a2 a4 a16 a32 \transpose c'' { a1 a2 a4 a16 a32 s16_" " } @end lilypond -If you don't specify a duration, the previous one is used: +If you don't specify a @rglos{duration}, the previous one is used: @example a4 a a2 a @@ -82,10 +82,10 @@ a4 a a2 a \transpose c'' { a a a2 a s16_" " } @end lilypond -A sharp (@texisharp{}) is made by adding @samp{is}, a flat -(@texiflat{}) by adding @samp{es}. As you would expect, a -double-sharp or double-flat is made by adding @samp{isis} or -@samp{eses}: +A @rglos{sharp} (@texisharp{}) is made by adding @samp{is}, a +@rglos{flat} (@texiflat{}) by adding @samp{es}. As you would expect, +a @rglos{double sharp} or @rglos{double flat} is made by adding +@samp{isis} or @samp{eses}: @example cis1 ees fisis aeses @@ -96,7 +96,8 @@ cis1 ees fisis aeses \transpose c'' { cis1 ees fisis aeses s16_" " } @end lilypond -Add a dot @samp{.} after the duration to get a dotted note: +Add a dot @samp{.} after the duration to get a @rglos{dotted note}: + @example a2. a4 a8. a16 @end example @@ -106,7 +107,8 @@ a2. a4 a8. a16 \transpose c'' { a2. a4 a8. a16 s16_" " } @end lilypond -The meter (or time signature) can be set with the @code{\time} command: +The @rglos{meter} (or @rglos{time signature}) can be set with the +@code{\time} command: @example \time 3/4 @@ -125,7 +127,7 @@ s4_" " s16_" " @end lilypond -The clef can be set using the @code{\clef} command: +The @rglos{clef} can be set using the @code{\clef} command: @c what is more common name treble or violin? @c in Dutch, its violin. @@ -151,7 +153,7 @@ s16_" " When you enter these commands in a file, you must to enclose them in @code{\notes @{@dots{}@}}. This lets LilyPond know that music (and -not lyrics, for example) follows: +not @rglos{lyrics}, for example) follows: @example \notes @{ -- 2.39.5