From 7d0a940d51413e1f2368753ece89ed8005b002fa Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 3 Oct 2007 21:35:56 -0700 Subject: [PATCH] identifier => variable. --- Documentation/user/ancient.itely | 2 +- Documentation/user/fundamental.itely | 9 ++++---- Documentation/user/non-music.itely | 5 ++--- .../user/programming-interface.itely | 4 ++-- Documentation/user/putting.itely | 2 +- Documentation/user/scheme-tutorial.itely | 8 +++---- Documentation/user/simultaneous.itely | 2 +- Documentation/user/tutorial.itely | 22 +++++++++---------- Documentation/user/vocal.itely | 14 ++++++------ Documentation/user/working.itely | 22 +++++++++---------- 10 files changed, 44 insertions(+), 46 deletions(-) diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely index 3972d87805..c75162e9d4 100644 --- a/Documentation/user/ancient.itely +++ b/Documentation/user/ancient.itely @@ -1001,7 +1001,7 @@ Deminutae} @c Therefore, it should somehow be included rather than duplicated all @c the time. --jr -@c why not make identifiers in ly/engraver-init.ly? --hwn +@c why not make variables in ly/engraver-init.ly? --hwn @c Because it's just used to typeset plain notes without @c a staff for demonstration purposes rather than something diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely index 794c6069a8..c086b6227f 100644 --- a/Documentation/user/fundamental.itely +++ b/Documentation/user/fundamental.itely @@ -111,9 +111,8 @@ accepts. @smallspace @cindex variables -@cindex identifiers -Another great shorthand is the ability to define identifiers. All +Another great shorthand is the ability to define variables. All the templates use this @example @@ -132,7 +131,7 @@ whenever it sees @code{\melody}. There's nothing special about the names -- it could be @code{melody}, @code{global}, @code{pianorighthand}, or @code{foofoobarbaz}. You can use whatever variable names you want. For more details, see -@ruser{Saving typing with identifiers and functions}. +@ruser{Saving typing with variables and functions}. @seealso @@ -236,7 +235,7 @@ braces next to @code{\new Voice = vocal}, we could start writing But if we did that, the @code{\score} section would get pretty long, and it would be harder to understand what was happening. So -let's use identifiers (or variables) instead. +let's use variables instead. @example melody = @{ @} @@ -262,7 +261,7 @@ lower = @{ @} @noindent Remember that you can use almost any name you like. The -limitations on identifier names are detailed in @ruser{File +limitations on variable names are detailed in @ruser{File structure}. When writing (or reading) a @code{\score} section, just take it diff --git a/Documentation/user/non-music.itely b/Documentation/user/non-music.itely index ec0516d6e6..787e747674 100644 --- a/Documentation/user/non-music.itely +++ b/Documentation/user/non-music.itely @@ -132,16 +132,15 @@ Markup texts are rendered above, between or below the scores or music expressions, wherever they appear. @cindex variables -@cindex identifiers @item -An identifier, such as +An variable, such as @example foo = @{ c4 d e d @} @end example This can be used later on in the file by entering @code{\foo}. The -name of an identifier should have alphabetic characters only; no +name of an variable should have alphabetic characters only; no numbers, underscores or dashes. @end itemize diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely index 1a657b60d6..e6ba1c6471 100644 --- a/Documentation/user/programming-interface.itely +++ b/Documentation/user/programming-interface.itely @@ -251,7 +251,7 @@ noPointAndClick = @subsection Functions without arguments In most cases a function without arguments should be written -with an identifier, +with an variable, @example dolce = \markup@{ \italic \bold dolce @} @@ -391,7 +391,7 @@ define some Scheme code in a macro (to be called later), use @refbugs -Mixing Scheme and LilyPond identifiers is not possible with the +Mixing Scheme and LilyPond variables is not possible with the @code{--safe} option. diff --git a/Documentation/user/putting.itely b/Documentation/user/putting.itely index 946c77adbf..b1a5dfa976 100644 --- a/Documentation/user/putting.itely +++ b/Documentation/user/putting.itely @@ -229,7 +229,7 @@ TODO: this is really old stuff from the really old tutorial. Rewrite, fix, etc. -gp In orchestral music, all notes are printed twice. Once in a part for -the musicians, and once in a full score for the conductor. Identifiers can +the musicians, and once in a full score for the conductor. Variables can be used to avoid double work. The music is entered once, and stored in a variable. The contents of that variable is then used to generate both the part and the full score. diff --git a/Documentation/user/scheme-tutorial.itely b/Documentation/user/scheme-tutorial.itely index 1c002ffc2e..eb5ec6b07a 100644 --- a/Documentation/user/scheme-tutorial.itely +++ b/Documentation/user/scheme-tutorial.itely @@ -154,11 +154,11 @@ width of staff lines. This makes stems almost twice as thick as their normal size. To distinguish between variables defined in input files (like @code{twentyFour} in the example above) and variables of internal objects, we will call the latter @q{properties} and the former -@q{identifiers.} So, the stem object has a @code{thickness} property, -while @code{twentyFour} is an identifier. +@q{variables.} So, the stem object has a @code{thickness} property, +while @code{twentyFour} is an variable. -@cindex properties vs. identifiers -@cindex identifiers vs. properties +@cindex properties vs. variables +@cindex variables vs. properties Two-dimensional offsets (X and Y coordinates) as well as object sizes (intervals with a left and right point) are entered as @code{pairs}. A diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely index c880c5cf77..1db3c4c579 100644 --- a/Documentation/user/simultaneous.itely +++ b/Documentation/user/simultaneous.itely @@ -93,7 +93,7 @@ accurately. Use @code{8 8} instead. In some instances of complex polyphonic music, you may need additional voices to avoid collisions between notes. Additional -voices are added by defining an identifier, as shown below: +voices are added by defining an variable, as shown below: @lilypond[quote,verbatim,ragged-right,relative=2] voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice) diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 1ff8d6cd79..a5a127360c 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1365,8 +1365,8 @@ example from Handel's Judas Maccabæus: but scores any more complex than this simple example are better produced by separating out the staff structure -from the notes and lyrics with identifiers. These are -discussed later (see @ref{Organizing pieces with identifiers}). +from the notes and lyrics with variables. These are +discussed later (see @ref{Organizing pieces with variables}). @seealso @quotation @@ -1387,7 +1387,7 @@ introduction to the rest of the manual. * Version number:: * Adding titles:: * Absolute note names:: -* Organizing pieces with identifiers:: +* Organizing pieces with variables:: * After the tutorial:: * How to read the manual:: @end menu @@ -1514,17 +1514,17 @@ intervals, and is extremely useful for computer-generated LilyPond files. -@node Organizing pieces with identifiers -@subsection Organizing pieces with identifiers +@node Organizing pieces with variables +@subsection Organizing pieces with variables When all of the elements discussed earlier are combined to produce larger files, the music expressions get a lot bigger. In polyphonic music with many staves, the input files can become very confusing. We can reduce this confusion by using -@emph{identifiers}. +@emph{variables}. -With identifiers (also known as variables or macros), we can break -up complex music expressions. An identifier is assigned as +With variables (also known as variables or macros), we can break +up complex music expressions. An variable is assigned as follows @example @@ -1534,7 +1534,7 @@ namedMusic = @{ @dots{} @} The contents of the music expression @code{namedMusic} can be used later by placing a backslash in front of the name (@code{\namedMusic}, just like a normal LilyPond command). -Identifiers must be defined @emph{before} the main music +Variables must be defined @emph{before} the main music expression. @lilypond[quote,verbatim,ragged-right] @@ -1554,7 +1554,7 @@ cello = \new Staff { \relative c { @end lilypond @noindent -The name of an identifier must have alphabetic characters only: no +The name of an variable must have alphabetic characters only: no numbers, underscores, or dashes. It is possible to use variables for many other types of objects in @@ -1566,7 +1566,7 @@ name = "Wendy" aFivePaper = \paper @{ paperheight = 21.0 \cm @} @end example -Depending on its contents, the identifier can be used in different +Depending on its contents, the variable can be used in different places. The following example uses the above variables: @example diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely index 467f63f274..e7a339e562 100644 --- a/Documentation/user/vocal.itely +++ b/Documentation/user/vocal.itely @@ -65,7 +65,7 @@ To make lyrics avoid barlines as well, use * Assigning more than one syllable to a single note:: * More than one note on a single syllable:: * Extenders and hyphens:: -* Working with lyrics and identifiers:: +* Working with lyrics and variables:: * Flexibility in placement:: * Lyrics to multiple notes of a melisma:: * Divisi lyrics:: @@ -227,7 +227,7 @@ any 8-bit character with ASCII code over 127, or a two-character combination of a backslash followed by one of @code{`}, @code{'}, @code{"}, or @code{^}. -To define identifiers containing lyrics, the function @code{lyricmode} +To define variables containing lyrics, the function @code{lyricmode} must be used. @example @@ -528,14 +528,14 @@ Program reference: @internalsref{LyricExtender}, @internalsref{LyricHyphen} -@node Working with lyrics and identifiers -@unnumberedsubsubsec Working with lyrics and identifiers -@cindex lyrics, identifiers +@node Working with lyrics and variables +@unnumberedsubsubsec Working with lyrics and variables +@cindex lyrics, variables -To define identifiers containing lyrics, the function @code{\lyricmode} +To define variables containing lyrics, the function @code{\lyricmode} must be used. You do not have to enter durations though, if you add @code{\addlyrics} or @code{\lyricsto} -when invoking your identifier. +when invoking your variable. @example verseOne = \lyricmode @{ Joy to the world the Lord is come @} diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely index d121f2cb57..0da6acf345 100644 --- a/Documentation/user/working.itely +++ b/Documentation/user/working.itely @@ -18,7 +18,7 @@ this chapter. @menu * Suggestions for writing LilyPond files:: -* Saving typing with identifiers and functions:: +* Saving typing with variables and functions:: * Style sheets:: * Updating old files:: * Troubleshooting (taking it all apart):: @@ -105,12 +105,12 @@ imbalance in the number of @code{@{} and @code{@}}. @item @strong{Explicitly add durations} at the beginnings of sections -and identifiers. If you specify @code{c4 d e} at the beginning of a +and variables. If you specify @code{c4 d e} at the beginning of a phrase (instead of just @code{c d e}) you can save yourself some problems if you rearrange your music later. @item @strong{Separate tweaks} from music definitions. See -@ruser{Saving typing with identifiers and functions}, and +@ruser{Saving typing with variables and functions}, and @ruser{Style sheets}. @end itemize @@ -149,7 +149,7 @@ lilypond files becomes vital. @itemize @bullet -@item @strong{Use an identifier for each voice}, with a minimum of +@item @strong{Use an variable for each voice}, with a minimum of structure inside the definition. The structure of the @code{\score} section is the most likely thing to change; the @code{violin} definition is extremely unlikely to change @@ -187,11 +187,11 @@ g4\fthenp c'8. e16 @end itemize -@node Saving typing with identifiers and functions -@section Saving typing with identifiers and functions +@node Saving typing with variables and functions +@section Saving typing with variables and functions @cindex variables -@cindex identifiers +@cindex variables By this point, you've seen this kind of thing: @@ -217,7 +217,7 @@ violin = \new Staff { \fragA \fragA \fragB \fragA } } @end lilypond -However, you can also use these identifiers (also known as +However, you can also use these variables (also known as variables, macros, or (user-defined) command) for tweaks: @lilypond[quote,verbatim,ragged-right] @@ -240,11 +240,11 @@ violin = \relative c'' { } @end lilypond -These identifiers are obviously useful for saving +These variables are obviously useful for saving typing. But they're worth considering even if you only use them once -- they reduce complexity. Let's look at the previous example without any -identifiers. It's a lot harder to read, especially +variables. It's a lot harder to read, especially the last line. @example @@ -283,7 +283,7 @@ padText = } @end lilypond -Using identifiers is also a good way to reduce work if the +Using variables is also a good way to reduce work if the LilyPond input syntax changes (see @ruser{Updating old files}). If you have a single definition (such as @code{\dolce}) for all your files (see @ruser{Style sheets}), then if the syntax changes, you -- 2.39.5