summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Holmes <mail@philholmes.net>2016-01-06 16:09:50 +0000
committerJames Lowe <pkx166h@gmail.com>2016-01-06 16:10:31 +0000
commit38bf956cd15ed3aa1cd296705f95bdbe56345e72 (patch)
tree36f3106bc59ea9412e98e9c85383e792047a8822
parent28e8f7c20c58dc86d01952bceb31a21d6c1c6b6d (diff)
Document all outside-staff-priority values and neaten table
Follows on from a question on -user. There aren't that many values of outside-staff-priority, so it seems easiest to list them all if we're going to list most. The adjustments to the column widths get rid of unnecessary line wrapping.
-rw-r--r--Documentation/learning/tweaks.itely29
-rw-r--r--Documentation/notation/spacing.itely3
2 files changed, 28 insertions, 4 deletions
diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely
index d5d5951b12..6d8217d12d 100644
--- a/Documentation/learning/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -2179,7 +2179,7 @@ change @code{outside-staff-priority} of the associated
placed at the start of the spanner, which might include several
linked hairpins and dynamics.
-@multitable @columnfractions .3 .3 .3
+@multitable @columnfractions .3 .15 .45
@headitem Layout Object
@tab Priority
@tab Controls position of:
@@ -2189,15 +2189,33 @@ linked hairpins and dynamics.
@item @code{MetronomeMark}
@tab @code{1000}
@tab Metronome marks
+@item @code{SostenutoPedalLineSpanner}
+ @tab @code{1000}
+ @tab Pedal indication
+@item @code{SustainPedalLineSpanner}
+ @tab @code{1000}
+ @tab
+@item @code{UnaCordaPedalLineSpanner}
+ @tab @code{1000}
+ @tab
+@item @code{MeasureCounter}
+ @tab @code{750}
+ @tab Measure number
@item @code{VoltaBracketSpanner}
@tab @code{600}
@tab Volta brackets
+@item @code{InstrumentSwitch}
+ @tab @code{500}
+ @tab Instrument switch text
@item @code{TextScript}
@tab @code{450}
@tab Markup text
@item @code{MultiMeasureRestText}
@tab @code{450}
- @tab Markup text over full-bar rests
+ @tab Markup text over multimeasure rests
+@item @code{CombineTextScript}
+ @tab @code{450}
+ @tab Part-combine text
@item @code{OttavaBracket}
@tab @code{400}
@tab Ottava brackets
@@ -2208,11 +2226,14 @@ linked hairpins and dynamics.
@tab @code{250}
@tab All dynamic markings
@item @code{BarNumber}
- @tab @code{ 100}
+ @tab @code{100}
@tab Bar numbers
@item @code{TrillSpanner}
@tab @code{50}
@tab Spanning trills
+@item @code{AccidentalSuggestion}
+ @tab @code{0}
+ @tab Annotational accidentals
@end multitable
Here is an example showing the default placement of some of
@@ -2272,7 +2293,7 @@ the placing you want, the priority of any of the objects may be
overridden. Suppose we would like the ottava bracket to be placed
below the text spanner in the example above. All we need to do is to
look up the priority of @code{OttavaBracket} in the IR or in the
-tables above, and reduce it to a value lower than that of a
+table above, and reduce it to a value lower than that of a
@code{TextSpanner}, remembering that @code{OttavaBracket} is created
in the @code{Staff} context:
diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index e954e9b9a6..be5715f2cd 100644
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -2642,6 +2642,9 @@ is, if two outside-staff grobs are competing for the same space, the one
with the lower @code{outside-staff-priority} will be placed closer to
the staff.
+A listing of outside-staff-priorities may be found in
+@rlearning{The outside-staff-priority property}.
+
@lilypond[quote,ragged-right,verbatim]
\relative c'' {
c4_"Text"\pp