From 4d6f2a27cc17261bc0970327de8665a6b771734b Mon Sep 17 00:00:00 2001
From: James Lowe <pkx166h@gmail.com>
Date: Tue, 15 Jul 2014 22:21:10 +0100
Subject: [PATCH] Doc: Appendix - Articulations and Ornamentation - part 2

Issue 1189

Create Texifo @multitable entries for the
List of Articulations appendix.

As there are a lot of separate scripts being
documented this Issue is going to be split
into multiple, smaller, parts to aid in the
review process. Part 1 was commit 8553021

This is part 2 and covers 'Fermata', 'Instrument
specific', 'Repeat signs' and 'Ancient' scripts.

Also, after more consideration, a third example
of each script has been added to show the
explicit differences between the up/down/neutral
positions. Not every script has a different
up/down glyph nor is positioned up/down when
placed on a note that is either top or bottom of
the Staff without explicit positioning. So this,
I hope just clarifies things (regardless whether
the position is musically 'correct' notation).

I have also sey the @code{} script examples into
the same column as the @lilypond examples; saving
a significant of wasted page space. Also I have
removed unnecessary lilypond-book variables making
the texinfo code less noisy.
---
 .../notation/notation-appendices.itely        | 413 +++++++++++-------
 1 file changed, 255 insertions(+), 158 deletions(-)

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index d4e6806d88..91d7d81998 100644
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -1509,54 +1509,10 @@ for more readability.
 @appendixsec List of articulations
 
 
-@cindex accent
-@cindex accentus
-@cindex circulus
-@cindex coda
-@cindex downbow
-@cindex downmordent
-@cindex downprall
-@cindex espressivo
-@cindex fermata
-@cindex flageolet
-@cindex halfopen
-@cindex ictus
-@cindex lheel
-@cindex lineprall
-@cindex longfermata
-@cindex ltoe
-@cindex marcato
-@cindex mordent
-@cindex open
-@cindex portato
-@cindex prall
-@cindex pralldown
-@cindex prallmordent
-@cindex prallprall
-@cindex prallup
-@cindex reverseturn
-@cindex rheel
-@cindex rtoe
-@cindex segno
-@cindex semicirculus
-@cindex shortfermata
-@cindex signumcongruentiae
-@cindex snappizzicato
-@cindex staccatissimo
-@cindex staccato
-@cindex stopped
-@cindex tenuto
-@cindex thumb
-@cindex trill
-@cindex turn
-@cindex upbow
-@cindex upmordent
-@cindex upprall
-@cindex varcoda
-@cindex verylongfermata
-
-The following scripts are available in the Feta font and may be
-attached to notes (eg. @samp{f\accent}).
+The following lists show all the scripts in the Feta font that may be
+attached to notes (eg. @samp{f\accent} or @samp{f->}).  Each example
+shows the script in the @emph{up}, @emph{down} and @emph{neutral}
+positions respectively.
 
 @c Articulations and ornamentations
 @c Fingering instructions (for "thumb")
@@ -1577,209 +1533,350 @@ attached to notes (eg. @samp{f\accent}).
 * Ancient scripts::
 @end menu
 
+@ignore
+The @multitable @columnfraction value discrepancy between the first and
+the remaining columns is deliberate; it seems (at least visually
+anyway) the gap (after building the documentation) between first and
+second column examples was always larger than between the remaining
+columns - JL
+@end ignore
+
+@cindex accent
+@cindex espressivo
+@cindex marcato
+@cindex portato
+@cindex staccatissimo
+@cindex staccato
+@cindex tenuto
+@cindex thumb
 
 @node Articulation scripts
 @unnumberedsubsec Articulation scripts
 
-@multitable @columnfractions .25 .25 .25 .25
-
-@headitem
-Example
-@tab
-Output
-@tab
-Example
-@tab
-Output
+@multitable @columnfractions .22 .25 .25 .25
 
 @item
-@code{\accent}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\accent e,_\accent
+@code{\accent} or @code{->}
+@lilypond[notime,relative=2]
+f^\accent e,_\accent b'\accent
 @end lilypond
 @tab
 @code{\espressivo}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\espressivo e,_\espressivo
+@lilypond[notime,relative=2]
+f^\espressivo e,_\espressivo b'\espressivo
 @end lilypond
-
-@item
-@code{\marcato}
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\marcato e,_\marcato
+@code{\marcato} or @code{-^}
+@lilypond[notime,relative=2]
+f^\marcato e,_\marcato b'\marcato
 @end lilypond
 @tab
-@code{\portato}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\portato e,_\portato
+@code{\portato} or @code{-_}
+@lilypond[notime,relative=2]
+f^\portato e,_\portato b'\portato
 @end lilypond
 
 @item
-@code{\staccatissimo}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\staccatissimo e,_\staccatissimo
+@code{\staccatissimo} @* or @code{-!}
+@lilypond[notime,relative=2]
+f^\staccatissimo e,_\staccatissimo b'\staccatissimo
 @end lilypond
 @tab
-@code{\staccato}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\staccato e,_\staccato
+@code{\staccato} or @code{-.}
+@lilypond[notime,relative=2]
+f^\staccato e,_\staccato b'\staccato
 @end lilypond
-
-@item
-@code{\tenuto}
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\tenuto e,_\tenuto
+@code{\tenuto} or @code{--}
+@lilypond[notime,relative=2]
+f^\tenuto e,_\tenuto b'\tenuto
 @end lilypond
 
 @end multitable
 
+@cindex prall
+@cindex prallup
+@cindex pralldown
+@cindex upprall
+@cindex downprall
+@cindex prallprall
+@cindex lineprall
+@cindex prallmordent
+@cindex mordent
+@cindex upmordent
+@cindex downmordent
+@cindex trill
+@cindex turn
+@cindex reverseturn
 
 @node Ornament scripts
 @unnumberedsubsec Ornament scripts
 
-@multitable @columnfractions .25 .25 .25 .25
+@multitable @columnfractions .22 .25 .25 .25
 
-@headitem
-Example
+@item
+@code{\prall}
+@lilypond[notime,relative=2]
+f^\prall e,_\prall b'\prall
+@end lilypond
 @tab
-Output
+@code{\prallup}
+@lilypond[notime,relative=2]
+f^\prallup e,_\prallup b'\prallup
+@end lilypond
 @tab
-Example
+@code{\pralldown}
+@lilypond[notime,relative=2]
+f^\pralldown e,_\pralldown b'\pralldown
+@end lilypond
 @tab
-Output
+@code{\upprall}
+@lilypond[notime,relative=2]
+f^\upprall e,_\upprall b'\upprall
+@end lilypond
 
 @item
-@code{\prall}
+@code{\downprall}
+@lilypond[notime,relative=2]
+f^\downprall e,_\downprall b'\downprall
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\prall e,_\prall
+@code{\prallprall}
+@lilypond[notime,relative=2]
+f^\prallprall e,_\prallprall b'\prallprall
 @end lilypond
 @tab
-@code{\mordent}
+@code{\lineprall}
+@lilypond[notime,relative=2]
+f^\lineprall e,_\lineprall b'\lineprall
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\mordent e,_\mordent
+@code{\prallmordent}
+@lilypond[notime,relative=2]
+f^\prallmordent e,_\prallmordent b'\prallmordent
 @end lilypond
 
 @item
-@code{\prallmordent}
+@code{\mordent}
+@lilypond[notime,relative=2]
+f^\mordent e,_\mordent b'\mordent
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\prallmordent e,_\prallmordent
+@code{\upmordent}
+@lilypond[notime,relative=2]
+f^\upmordent e,_\upmordent b'\upmordent
 @end lilypond
 @tab
-@code{\turn}
+@code{\downmordent}
+@lilypond[notime,relative=2]
+f^\downmordent e,_\downmordent b'\downmordent
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\turn e,_\turn
+@code{\trill}
+@lilypond[notime,relative=2]
+f^\trill e,_\trill b'\trill
 @end lilypond
 
 @item
-@code{\upprall}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\upprall e,_\upprall
+@code{\turn}
+@lilypond[notime,relative=2]
+f^\turn e,_\turn b'\reverseturn
 @end lilypond
 @tab
-@code{\downprall}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\downprall e,_\downprall
+@code{\reverseturn}
+@lilypond[notime,relative=2]
+f^\reverseturn e,_\reverseturn b'\reverseturn
 @end lilypond
 
+@end multitable
+
+@cindex fermata
+@cindex shortfermata
+@cindex longfermata
+@cindex verylongfermata
+
+@node Fermata scripts
+@unnumberedsubsec Fermata scripts
+
+@multitable @columnfractions .22 .25 .25 .25
+
 @item
-@code{\upmordent}
+@code{\shortfermata}
+@lilypond[notime,relative=2]
+f^\shortfermata e,_\shortfermata b'\shortfermata
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\upmordent e,_\upmordent
+@code{\fermata}
+@lilypond[notime,relative=2]
+f^\fermata e,_\fermata b'\fermata
 @end lilypond
 @tab
-@code{\downmordent}
+@code{\longfermata}
+@lilypond[notime,relative=2]
+f^\longfermata e,_\longfermata b'\longfermata
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\downmordent e,_\downmordent
+@code{\verylongfermata}
+@lilypond[notime,relative=2]
+f^\verylongfermata e,_\verylongfermata b'\verylongfermata
 @end lilypond
 
+@end multitable
+
+@cindex upbow
+@cindex downbow
+@cindex flageolet
+@cindex open
+@cindex halfopen
+@cindex lheel
+@cindex rheel
+@cindex ltoe
+@cindex rtoe
+@cindex snappizzicato
+@cindex stopped
+
+@node Instrument-specific scripts
+@unnumberedsubsec Instrument-specific scripts
+
+@multitable @columnfractions .22 .25 .25 .25
+
 @item
-@code{\lineprall}
+@code{\upbow}
+@lilypond[notime,relative=2]
+f^\upbow e,_\upbow b'\upbow
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\lineprall e,_\lineprall
+@code{\downbow}
+@lilypond[notime,relative=2]
+f^\downbow e,_\downbow b'\downbow
 @end lilypond
 @tab
-@code{\prallprall}
+@code{\flageolet}
+@lilypond[notime,relative=2]
+f^\flageolet e,_\flageolet b'\flageolet
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\prallprall e,_\prallprall
+@code{\open}
+@lilypond[notime,relative=2]
+f^\open e,_\open b'\open
 @end lilypond
 
 @item
-@code{\pralldown}
+@code{\halfopen}
+@lilypond[notime,relative=2]
+f^\halfopen e,_\halfopen b'\halfopen
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\pralldown e,_\pralldown
+@code{\lheel}
+@lilypond[notime,relative=2]
+f^\lheel e,_\lheel b'\lheel
 @end lilypond
 @tab
-@code{\prallup}
+@code{\rheel}
+@lilypond[notime,relative=2]
+f^\rheel e,_\rheel b'\rheel
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\prallup e,_\prallup
+@code{\ltoe}
+@lilypond[notime,relative=2]
+f^\ltoe e,_\ltoe b'\ltoe
 @end lilypond
 
 @item
-@code{\reverseturn}
-@tab
-@lilypond[notime,ragged-right,relative=2]
-f\reverseturn e,_\reverseturn
+@code{\rtoe}
+@lilypond[notime,relative=2]
+f^\rtoe e,_\rtoe b'\rtoe
 @end lilypond
 @tab
-@code{\trill}
+@code{\snappizzicato}
+@lilypond[notime,relative=2]
+f^\snappizzicato e,_\snappizzicato b'\snappizzicato
+@end lilypond
 @tab
-@lilypond[notime,ragged-right,relative=2]
-f\trill e,_\trill
+@code{\stopped} or @code{-+}
+@lilypond[notime,relative=2]
+f^\stopped e,_\stopped b'\stopped
 @end lilypond
 
 @end multitable
 
-@node Fermata scripts
-@unnumberedsubsec Fermata scripts
+@cindex segno
+@cindex coda
+@cindex varcoda
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #fermatas }
-@end lilypond
+@node Repeat sign scripts
+@unnumberedsubsec Repeat sign scripts
 
-@node Instrument-specific scripts
-@unnumberedsubsec Instrument-specific scripts
+@multitable @columnfractions .22 .25 .25 .25
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #instrument-specific }
+@item
+@code{\segno}
+@lilypond[notime,relative=2]
+f^\segno e,_\segno b'\segno
+@end lilypond
+@tab
+@code{\coda}
+@lilypond[notime,relative=2]
+f^\coda e,_\coda b'\coda
+@end lilypond
+@tab
+@code{\varcoda}
+@lilypond[notime,relative=2]
+f^\varcoda e,_\varcoda b'\varcoda
 @end lilypond
 
-@node Repeat sign scripts
-@unnumberedsubsec Repeat sign scripts
+@end multitable
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #repeats }
-@end lilypond
+@cindex accentus
+@cindex circulus
+@cindex ictus
+@cindex semicirculus
+@cindex signumcongruentiae
 
 @node Ancient scripts
 @unnumberedsubsec Ancient scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
+@multitable @columnfractions .22 .25 .25 .25
+
+@item
+@code{\accentus}
+@lilypond[notime]
 \include "gregorian.ly"
-\new VaticanaStaff { \scriptStaffAncient #ancient }
+\new VaticanaStaff { e'^\accentus s4 f_\accentus s4 b\accentus}
 @end lilypond
+@tab
+@code{\circulus}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff { e'^\circulus s4 f_\circulus s4 b\circulus  }
+@end lilypond
+@tab
+@code{\ictus}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff { e'^\ictus s4 f_\ictus s4 b\ictus}
+@end lilypond
+
+@item
+@code{\semicirculus}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff {
+  e'^\semicirculus s4 f_\semicirculus s4 b\semicirculus
+}
+@end lilypond
+@tab
+@code{\signumcongruentiae}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff {
+  e'^\signumcongruentiae s4
+  f_\signumcongruentiae s4
+  b\signumcongruentiae
+}
+@end lilypond
+
+@end multitable
 
 
 @node Percussion notes
-- 
2.39.2