diff options
author | David Kastrup <dak@gnu.org> | 2016-06-14 20:41:13 +0200 |
---|---|---|
committer | David Kastrup <dak@gnu.org> | 2016-06-21 09:57:31 +0200 |
commit | 09ef86c87175cc6c1071eedb022ed1d01a93bcaf (patch) | |
tree | e05fe68ab0865e52f371a325c4de997934bfa108 /Documentation/learning | |
parent | 893eca274995ace99dc5ed46b2d0711cd1cb0ab0 (diff) |
Issue 4894: Remove unescaped @funindex entries
With adjacent @funindex entries of which one differs from the other
only by the absence of a preceding backslash, the one without the
preceding backslash is removed. This is done by using the script:
sed -i '/^@funindex/{N;s/^@funindex \\\([^\n\\]*\)\n@funindex \1$/@funindex \\\1/mg;s/^@funindex \([^\n\\]*\)\n@funindex \\\1$/@funindex \\\1/mg;P;D;}' $(git grep -l '^@funindex')
Diffstat (limited to 'Documentation/learning')
-rw-r--r-- | Documentation/learning/common-notation.itely | 17 | ||||
-rw-r--r-- | Documentation/learning/fundamental.itely | 27 | ||||
-rw-r--r-- | Documentation/learning/tutorial.itely | 4 | ||||
-rw-r--r-- | Documentation/learning/tweaks.itely | 15 |
4 files changed, 0 insertions, 63 deletions
diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely index 1f68b2b5c7..b51766c0a2 100644 --- a/Documentation/learning/common-notation.itely +++ b/Documentation/learning/common-notation.itely @@ -178,11 +178,8 @@ like German and Dutch. To use other names for @cindex layout vs. content @funindex \key -@funindex key @funindex \major -@funindex major @funindex \minor -@funindex minor Music Glossary: @rglos{key signature}, @rglos{major}, @rglos{minor}. @@ -441,11 +438,8 @@ to let LilyPond determine the articulation directions. @funindex \mf @funindex \pp @funindex \< -@funindex < @funindex \> -@funindex > @funindex \! -@funindex ! Music Glossary: @rglos{dynamics}, @rglos{crescendo}, @rglos{decrescendo}. @@ -483,7 +477,6 @@ Notation Reference: @cindex markup @funindex \markup -@funindex markup Text may be added to your scores: @@ -520,9 +513,7 @@ Notation Reference: @funindex [ @funindex ] @funindex \autoBeamOff -@funindex autoBeamOff @funindex \autoBeamOn -@funindex autoBeamOn Music Glossary: @rglos{beam}. @@ -579,7 +570,6 @@ Notation Reference: @cindex partial measure @funindex \partial -@funindex partial Music Glossary: @rglos{anacrusis}. @@ -602,7 +592,6 @@ is a quarter note pickup and @code{\partial 8} an eighth note. @cindex triplets @funindex \tuplet -@funindex tuplet Music Glossary: @rglos{note value}, @rglos{triplet}. @@ -631,9 +620,7 @@ For triplets, there are three notes instead of two, so @cindex appoggiatura @funindex \grace -@funindex grace @funindex \acciaccatura -@funindex acciaccatura @funindex \appoggiatura @funindex acciaccatura @@ -821,10 +808,8 @@ out on a single staff. @cindex notation context @funindex \new Staff -@funindex new Staff @funindex Staff @funindex \new -@funindex new @funindex Score @funindex Voice @funindex Lyrics @@ -1020,7 +1005,6 @@ This section introduces vocal music and simple song sheets. @cindex songs @funindex \addlyrics -@funindex addlyrics Music Glossary: @rglos{lyrics}. @@ -1387,7 +1371,6 @@ places. The following example uses the above variables: @cindex header block @funindex \header -@funindex header The title, composer, opus number, and similar information are entered in the @code{\header} block. This exists outside of the diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely index b936ca4971..6b74fe954a 100644 --- a/Documentation/learning/fundamental.itely +++ b/Documentation/learning/fundamental.itely @@ -68,9 +68,7 @@ There are many variations of this basic pattern, but this example serves as a useful starting place. @funindex \book -@funindex book @funindex \score -@funindex score @cindex book @cindex score @@ -154,11 +152,8 @@ things, such as @end example @funindex \header -@funindex header @funindex \layout -@funindex layout @funindex \midi -@funindex midi @cindex header @cindex layout @cindex midi @@ -184,7 +179,6 @@ Notation Reference -- @ruser{Score layout}, and @cindex book block, implicit @cindex implicit book block @funindex \book -@funindex book You may code multiple @code{\score} blocks. Each will be treated as a separate score, but they will be all combined into @@ -252,7 +246,6 @@ For a complete definition of the input format, see @subsection Score is a (single) compound musical expression @funindex \score -@funindex score @cindex score @cindex contents of a score block @cindex score block, contents of @@ -944,15 +937,10 @@ Notation Reference: @ruser{Multiple voices}. @subsection Explicitly instantiating voices @funindex \voiceOne -@funindex voiceOne @funindex \voiceTwo -@funindex voiceTwo @funindex \voiceThree -@funindex voiceThree @funindex \voiceFour -@funindex voiceFour @funindex \oneVoice -@funindex oneVoice @funindex \new Voice @cindex voice contexts, creating @@ -1139,13 +1127,9 @@ as here: @cindex collisions, notes @cindex shift commands @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Closely spaced notes in a chord, or notes occurring at the same time in different voices, are arranged in two, occasionally more, @@ -1196,7 +1180,6 @@ expressions -- notes and lyrics. @funindex \new Lyrics @funindex \lyricsto -@funindex lyricsto @funindex Lyrics @cindex Lyrics context, creating @cindex lyrics, linking to voice @@ -1232,7 +1215,6 @@ explicitly. @cindex lyrics and beaming @cindex beaming and lyrics @funindex \autoBeamOff -@funindex autoBeamOff The automatic beaming which LilyPond uses by default works well for instrumental music, but not so well for music with lyrics, @@ -1243,7 +1225,6 @@ melismata in the lyrics. In the example above we use the command @funindex \new ChoirStaff @funindex ChoirStaff @funindex \lyricmode -@funindex lyricmode @cindex vocal score structure @cindex choir staff @@ -1451,7 +1432,6 @@ Notation Reference: @ruser{Contexts explained}. @subsection Creating contexts @funindex \new -@funindex new @cindex new contexts @cindex creating contexts @cindex contexts, creating @@ -1653,9 +1633,7 @@ Internals reference: @rinternals{Engravers and Performers}. @cindex context properties, modifying @cindex modifying context properties @funindex \set -@funindex set @funindex \unset -@funindex unset Contexts are responsible for holding the values of a number of context @emph{properties}. Many of them can be changed to @@ -1849,7 +1827,6 @@ general way by using the very powerful @code{\markup} command. @subsubheading Setting context properties with @code{\with} @funindex \with -@funindex with @cindex context properties, setting with \with The default value of context properties may be set at the time the @@ -1898,7 +1875,6 @@ with @code{\set}, this new default value may be restored with the @cindex context properties, setting with \context @funindex \context -@funindex context The values of context properties may be set in @emph{all} contexts of a particular type, such as all @code{Staff} contexts, with a single @@ -1977,9 +1953,7 @@ Internals Reference: @cindex removing engravers @funindex \consists -@funindex consists @funindex \remove -@funindex remove We have seen that contexts each contain several engravers, each of which is responsible for producing a particular part of the @@ -2075,7 +2049,6 @@ the notes in all the voices on that staff: @subsubheading Changing all contexts of the same type @funindex \layout -@funindex layout The examples above show how to remove or add engravers to individual contexts. It is also possible to remove or add diff --git a/Documentation/learning/tutorial.itely b/Documentation/learning/tutorial.itely index f4e9302eae..27084f32ea 100644 --- a/Documentation/learning/tutorial.itely +++ b/Documentation/learning/tutorial.itely @@ -206,7 +206,6 @@ values are useful. @cindex relative mode, and accidentals @funindex \relative -@funindex relative @funindex ' @funindex , @@ -379,7 +378,6 @@ A @notation{rest} is entered just like a note with the name @cindex time signature @funindex \time -@funindex time Music Glossary: @rglos{time signature}. @@ -404,7 +402,6 @@ command: @cindex metronome marks @funindex \tempo -@funindex tempo Music Glossary: @rglos{tempo indication}, @rglos{metronome}. @@ -436,7 +433,6 @@ set with the @code{\tempo} command: @cindex bass @funindex \clef -@funindex clef Music Glossary: @rglos{clef}. diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely index 95229692d6..001f4136a3 100644 --- a/Documentation/learning/tweaks.itely +++ b/Documentation/learning/tweaks.itely @@ -207,7 +207,6 @@ Notation Reference: @cindex override syntax @funindex \override -@funindex override We have already met the commands @code{\set} and @code{\with}, used to change the properties of @strong{contexts} and to remove and add @@ -280,7 +279,6 @@ color of the note head: @cindex revert command @funindex \revert -@funindex revert Once overridden, the property retains its new value until it is overridden again or a @code{\revert} command is encountered. @@ -318,7 +316,6 @@ of the note head to the default value for the final two notes: @unnumberedsubsubsec The @code{@bs{}once} prefix @funindex \once -@funindex once @code{\override}, @code{\revert}, @code{\set}, and @code{\unset} commands may be prefixed with @code{\once}. This causes such a @@ -365,7 +362,6 @@ predefined commands to limit their effect to one musical moment: @cindex overrideProperty command @funindex \overrideProperty -@funindex overrideProperty There is another form of the override command, @code{\overrideProperty}, which is occasionally required. @@ -380,7 +376,6 @@ We mention it here for completeness, but for details see @cindex tweak command @funindex \tweak -@funindex tweak The final tweaking command which is available is @code{\tweak}. This should be used when several objects occur at the same musical moment, @@ -787,7 +782,6 @@ location. @cindex once override @funindex \once -@funindex once As you can see, @emph{all} the slurs are thicker in the final example above. But what if we wanted just the first slur to be thicker? This @@ -832,7 +826,6 @@ command. @cindex default properties, reverting to @funindex \revert -@funindex revert Finally, what if we wanted just the first two slurs to be heavier? Well, we could use two commands, each preceded by @@ -2243,9 +2236,7 @@ these. @cindex ottava bracket @funindex \startTextSpan -@funindex startTextSpan @funindex \stopTextSpan -@funindex stopTextSpan @cindex TextSpanner, example of overriding @cindex bound-details property, example @@ -2393,9 +2384,7 @@ command. @cindex notes, spreading out with text @funindex \textLengthOn -@funindex textLengthOn @funindex \textLengthOff -@funindex textLengthOff By default, text produced by markup takes up no horizontal space as far as laying out the music is concerned. The @code{\textLengthOn} @@ -2906,13 +2895,9 @@ and notes in different voices. @cindex collisions, notes @cindex shift commands @funindex \shiftOff -@funindex shiftOff @funindex \shiftOn -@funindex shiftOn @funindex \shiftOnn -@funindex shiftOnn @funindex \shiftOnnn -@funindex shiftOnnn Within a voice, all the notes occuring at the same musical moment are grouped into a note column, and a @code{NoteColumn} object is created |