From: Graham Percival Date: Wed, 14 Nov 2007 21:23:15 +0000 (-0800) Subject: @samp -> @code. X-Git-Tag: release/2.11.35-1~25 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=51a676fbbffc2fa6f01ff802e47666dd0df03c7d;p=lilypond.git @samp -> @code. --- diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 2b4ea73edb..817c150a40 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -1319,7 +1319,7 @@ F = \tweak #'font-size #-3 -\flageolet @noindent With other words, @code{\tweak} doesn't behave like an articulation regarding the syntax; in particular, it can't be attached with -@samp{^} and @samp{_}. +@code{^} and @code{_}. Using Scheme, this problem can be circumvented. The route to the result is given in @ref{Adding articulation to notes (example)}, @@ -1340,12 +1340,12 @@ F = #(let ((m (make-music 'ArticulationEvent @noindent Here, the @code{tweaks} properties of the flageolet object -@samp{m} (created with @code{make-music}) are extracted with +@code{m} (created with @code{make-music}) are extracted with @code{ly:music-property}, a new key-value pair to change the font size is prepended to the property list with the @code{acons} Scheme function, and the result is finally written back with @code{set!}. The last element of the -@code{let} block is the return value, @samp{m} itself. +@code{let} block is the return value, @code{m} itself. @node \set versus \override diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely index f843f2e978..7814a511bc 100644 --- a/Documentation/user/converters.itely +++ b/Documentation/user/converters.itely @@ -90,7 +90,7 @@ Show summary of usage. @item -k, --key=@var{acc}[:@var{minor}] Set default key. @math{@var{acc} > 0} sets number of sharps; @math{@var{acc} < 0} sets number of flats. A minor key is indicated by -@samp{:1}. +@code{:1}. @item -o, --output=@var{file} Write output to @var{file}. diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely index 82aaac925a..c3d134d3d6 100644 --- a/Documentation/user/fundamental.itely +++ b/Documentation/user/fundamental.itely @@ -1022,7 +1022,7 @@ substitutes the contents of @file{horn-music.ly} at this position in the file, so @code{hornNotes} is defined afterwards. The command @code{\transpose f@tie{}c'} indicates that the argument, being @code{\hornNotes}, should be transposed by a fifth upwards. Sounding -@samp{f} is denoted by notated @code{c'}, which corresponds with the +@code{f} is denoted by notated @code{c'}, which corresponds with the tuning of a normal French Horn in@tie{}F. The transposition can be seen in the following output @@ -1035,7 +1035,7 @@ in the following output In ensemble pieces, one of the voices often does not play for many measures. This is denoted by a special rest, the multi-measure -rest. It is entered with a capital @samp{R} followed by a duration +rest. It is entered with a capital @code{R} followed by a duration (@code{1}@tie{}for a whole note, @code{2}@tie{}for a half note, etc.). By multiplying the duration, longer rests can be constructed. For example, this rest diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely index ea60619d20..7220aaf663 100644 --- a/Documentation/user/input.itely +++ b/Documentation/user/input.itely @@ -24,7 +24,7 @@ rather than specific notation. @section Input files The main format of input for LilyPond are text files. By convention, -these files end with @samp{.ly}. +these files end with @code{.ly}. @menu * File structure:: @@ -363,7 +363,7 @@ option when invoking @code{lilypond --include=DIR} which adds DIR to the search path. The @code{\include} statement can use full path information, but with the Unix -convention @samp{/} rather than the DOS/Windows @samp{\}. For example, +convention @code{/} rather than the DOS/Windows @code{\}. For example, if @file{stuff.ly} is located one directory higher than the current working directory, use diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely index 0f45adf4db..52d3a18f87 100644 --- a/Documentation/user/install.itely +++ b/Documentation/user/install.itely @@ -236,7 +236,7 @@ points into your home directory, e.g. If you want to build multiple versions of LilyPond with different configuration settings, you can use the @code{--enable-config=CONF} -option of configure. You should use @samp{make conf=CONF} to generate +option of configure. You should use @code{make conf=CONF} to generate the output in @file{out-CONF}. Example: Suppose you want to build with and without profiling, then use the following for the normal build diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely index 620c698d2c..2783c79a6a 100644 --- a/Documentation/user/programming-interface.itely +++ b/Documentation/user/programming-interface.itely @@ -589,7 +589,7 @@ d' @subsection Doubling a note with slurs (example) Suppose we want to create a function which translates -input like @samp{a} into @samp{a( a)}. We begin +input like @code{a} into @code{a( a)}. We begin by examining the internal representation of the music we want to end up with. diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index c44f0cad13..8c50d30b66 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -82,7 +82,7 @@ a a a2 a a4 a a1 a @funindex . -To obtain dotted note lengths, simply add a dot (@samp{.}) to the +To obtain dotted note lengths, simply add a dot (@code{.}) to the number. Double-dotted notes are produced in a similar way. @lilypond[quote,ragged-right,fragment,verbatim,relative=2] @@ -1926,7 +1926,7 @@ c1 c c c @funindex | Bar checks help detect errors in the entered durations. -A bar check may be entered using the bar symbol, @samp{|}, +A bar check may be entered using the bar symbol, @code{|}, at any place where a bar line is expected to fall. If bar check lines are encountered at other places, a list of warnings is printed in the log file, @@ -1956,10 +1956,10 @@ incorrect durations. @funindex pipeSymbol It is also possible to redefine the action taken when a bar check -or pipe symbol, @samp{|}, is encountered in the input, so that +or pipe symbol, @code{|}, is encountered in the input, so that it does something other than a bar check. This is done by assigning a music expression to @code{pipeSymbol}. -In the following example @samp{|} is set to insert a double bar +In the following example @code{|} is set to insert a double bar line wherever it appears in the input, rather than checking for end of bar. diff --git a/Documentation/user/running.itely b/Documentation/user/running.itely index 88cb790510..ab16f7e913 100644 --- a/Documentation/user/running.itely +++ b/Documentation/user/running.itely @@ -324,7 +324,7 @@ mount a loop device. A separate filesystem also guarantees that LilyPond cannot write more space than it is allowed. @item Setting up a separate user -A separate user and group (say, @samp{lily}/@samp{lily}) with low +A separate user and group (say, @code{lily}/@code{lily}) with low privileges should be used to run LilyPond inside the jail. There should be a single directory writable by this user, which should be passed in @var{dir}. @@ -486,7 +486,7 @@ convert-ly -e myfile.ly @noindent MacOS X users may execute this command under the menu entry -@samp{Compile > Update syntax}. +@code{Compile > Update syntax}. If there are no changes to myfile.ly and file called myfile.ly.NEW is created, then myfile.ly is already updated. diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index eb0131df2c..56efaa688b 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -137,7 +137,7 @@ first. After this, LilyPond will be much faster!} If you double click @code{LilyPond.app}, it will open with an example file. Save it, for example, to @file{test.ly} on your -Desktop, and then process it with the menu command @samp{Compile > +Desktop, and then process it with the menu command @code{Compile > Typeset File}. The resulting PDF file will be displayed on your screen. @@ -321,8 +321,8 @@ Music glossary: @rglos{beam}, @rglos{duration}, @rglos{whole note}, @rglos{half note}, @rglos{quarter note}, @rglos{dotted note}. The @notation{duration} of a note is specified by a number after -the note name. @samp{1} for a @notation{whole note}, @samp{2} for -a @notation{half note}, @samp{4} for a @notation{quarter note} and +the note name. @code{1} for a @notation{whole note}, @code{2} for +a @notation{half note}, @code{4} for a @notation{quarter note} and so on. @notation{Beams} are added automatically. @lilypond[verbatim,quote,ragged-right] @@ -338,7 +338,7 @@ If you do not specify a duration, the previous duration is used for the next note. The duration of the first note defaults to a quarter. -To create @notation{dotted notes}, add a dot @samp{.} to the duration +To create @notation{dotted notes}, add a dot @code{.} to the duration number. @lilypond[verbatim,quote,ragged-right] @@ -353,7 +353,7 @@ number. Music glossary: @rglos{rest}. -A @notation{rest} is entered just like a note with the name @samp{r}: +A @notation{rest} is entered just like a note with the name @code{r}: @lilypond[verbatim,quote,ragged-right] \relative c'' { @@ -472,7 +472,7 @@ thumb is to indent code blocks with either a tab or two spaces: Every piece of LilyPond input needs to have @strong{@{ curly braces @}} placed around the input. These braces tell LilyPond that the input is a single music expression, just like parentheses -@samp{()} in mathematics. The braces should be surrounded by a +@code{()} in mathematics. The braces should be surrounded by a space unless they are at the beginning or end of a line to avoid ambiguities. @@ -487,7 +487,7 @@ single music expression. A comment is a remark for the human reader of the music input; it is ignored while parsing, so it has no effect on the printed output. There are two types of comments. The percent symbol -@samp{%} introduces a line comment; anything after @samp{%} on +@code{%} introduces a line comment; anything after @code{%} on that line is ignored. A block comment marks a whole section of music input as a comment. Anything that is enclosed in @code{%@{} and @code{%@}} is ignored. (Comments do not nest.) The following @@ -584,10 +584,10 @@ on one staff. Music glossary: @rglos{sharp}, @rglos{flat}, @rglos{double sharp}, @rglos{double flat}, @rglos{accidental}. -A @notation{sharp} pitch is made by adding @samp{is} to the name, and -a @notation{flat} pitch by adding @samp{es}. As you might expect, a +A @notation{sharp} pitch is made by adding @code{is} to the name, and +a @notation{flat} pitch by adding @code{es}. As you might expect, a @notation{double sharp} or @notation{double flat} is made by adding -@samp{isis} or @samp{eses}. This syntax derived from note +@code{isis} or @code{eses}. This syntax derived from note naming conventions in Nordic and Germanic languages, like German and Dutch. To use other names for @notation{accidentals}, see @ruser{Note names in other languages}. @@ -644,9 +644,9 @@ d cis fis @noindent No note has a printed accidental, but you must still add the -@samp{is} to @code{cis} and @code{fis}. +@code{is} to @code{cis} and @code{fis}. -The code @samp{e} does not mean @qq{print a black dot just below +The code @code{e} does not mean @qq{print a black dot just below the first line of the staff.} Rather, it means @qq{there is a note with pitch E-natural.} In the key of A-flat major, it @emph{does} get an accidental: @@ -679,7 +679,7 @@ Music glossary: @rglos{Pitch names}. Music glossary: @rglos{tie}. -A @notation{tie} is created by appending a tilde @samp{~} to the +A @notation{tie} is created by appending a tilde @code{~} to the first note being tied. @lilypond[verbatim,quote,ragged-right,fragment,relative=2] @@ -693,7 +693,7 @@ c4 ~ c8 a8 ~ a2 Music glossary: @rglos{slur}. A @notation{slur} is a curve drawn across many notes. The starting -note and ending note are marked with @samp{(} and @samp{)} +note and ending note are marked with @code{(} and @code{)} respectively. @lilypond[verbatim,quote,ragged-right,fragment,relative=2] @@ -749,7 +749,7 @@ Notation reference: @ruser{Ties}, @ruser{Slurs}, Music glossary: @rglos{articulation}. Common @notation{articulations} can be added to a note using a -dash @samp{-} and a single character: +dash @code{-} and a single character: @lilypond[verbatim,quote,ragged-right,fragment,relative=2] c-. c-- c-> c-^ c-+ c-_ @@ -761,14 +761,14 @@ c-. c-- c-> c-^ c-+ c-_ Music glossary: @rglos{fingering}. Similarly, @notation{fingering} indications can be added to a note using -a dash (@samp{-}) and the digit to be printed: +a dash (@code{-}) and the digit to be printed: @lilypond[verbatim,quote,ragged-right,fragment,relative=2] c-3 e-5 b-2 a-1 @end lilypond Articulations and fingerings are usually placed automatically, but -you can specify a direction using @samp{^} (up) or @samp{_} +you can specify a direction using @code{^} (up) or @code{_} (down). You can also use multiple articulations on the same note. However, in most cases it is best to let LilyPond determine the articulation directions. @@ -848,8 +848,8 @@ a8 ais d ees r d c16 b a8 @noindent If you do not like the automatic beams, they may be overridden -manually. Mark the first note to be beamed with @samp{[} and the -last one with @samp{]}. +manually. Mark the first note to be beamed with @code{[} and the +last one with @code{]}. @lilypond[verbatim,quote,ragged-right,fragment,relative=2] a8[ ais] d[ ees r d] a b @@ -1036,7 +1036,7 @@ arbitrarily complex and large expressions. For example, This is a sequence of expressions, where each expression is contained in the next (larger) one. The simplest expressions are numbers, and larger ones are made by combining expressions with -operators (like @samp{+}, @samp{*} and @samp{/}) and parentheses. +operators (like @code{+}, @code{*} and @code{/}) and parentheses. Like mathematical expressions, music expressions can be nested arbitrarily deep, which is necessary for complex music like polyphonic scores. @@ -1143,8 +1143,8 @@ Notation reference: @ruser{Piano music}. Music glossary: @rglos{chord}. @notation{Chords} can be made by surrounding pitches with single -angle brackets. Angle brackets are the symbols @samp{<} and -@samp{>}. +angle brackets. Angle brackets are the symbols @code{<} and +@code{>}. @lilypond[verbatim,quote,ragged-right,fragment,relative=2] r4 4 2 @@ -1187,8 +1187,8 @@ separating the voices with @code{\\} For polyphonic music typesetting, spacer rests can also be convenient; these are rests that do not print. They are useful for filling up voices that temporarily do not play. Here is the -same example with a spacer rest (@samp{s}) instead of a normal -rest (@samp{r}), +same example with a spacer rest (@code{s}) instead of a normal +rest (@code{r}), @lilypond[verbatim,quote,ragged-right,fragment,relative=2] << diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely index e3832409a9..e917368e5b 100644 --- a/Documentation/user/working.itely +++ b/Documentation/user/working.itely @@ -573,9 +573,9 @@ are listed in @rprogram{Updating files with convert-ly}. For example, in LilyPond 2.4 and earlier, accents and non-English letters were entered using LaTeX -- for example, -@samp{No\"el} (this would print the French word for +@code{No\"el} (this would print the French word for @q{Christmas}). In LilyPond 2.6 and above, the special -@samp{ë} must be entered directly into the LilyPond file as an +@code{ë} must be entered directly into the LilyPond file as an UTF-8 character. @code{convert-ly} cannot change all the LaTeX special characters into UTF-8 characters; you must manually update your old LilyPond files.