\version "2.11.42"
-\layout { ragged-right = ##t }
\header {
lsrtags = "rhythms,tweaks-and-overrides"
texidoc = "
\version "2.11.47"
-\layout { ragged-right = ##t }
\header {
lsrtags = "rhythms,tweaks-and-overrides"
texidoc = "
}
\relative c'' {
- \set crescendoText = \markup { \italic { cresc. poco } }
- \set crescendoSpanner = #'text
- \override DynamicTextSpanner #'style = #'dotted-line
- a2\< a
- a2 a
- a2 a
- a2 a\mf
+ \set crescendoText = \markup { \italic { cresc. poco } }
+ \set crescendoSpanner = #'text
+ \override DynamicTextSpanner #'style = #'dotted-line
+ a2\< a
+ a2 a
+ a2 a
+ a2 a\mf
}
\header {
lsrtags = "rhythms,contexts-and-engravers"
texidoc = "The @code{measureLength} property, together with
-@code{measurePosition}, determines when a bar line is needed. However,
+@code{measurePosition}, determines when a bar line is needed. However,
when using @code{\\scaleDurations}, the scaling of durations makes it
-difficult to change time signatures without making a mess of it.
-Therefore, @code{measureLength} has to be set manually, using the
-@code{ly:make-moment} callback. The second argument must be the same as
-the second argument of @code{\\scaleDurations}."
+difficult to change time signatures. In this case, @code{measureLength}
+should be set manually, using the @code{ly:make-moment} callback. The
+second argument must be the same as the second argument of
+@code{\\scaleDurations}."
doctitle = "Changing time signatures inside a polymetric section using @code{\\scaleDurations}"
}
\version "2.10.0"
-\layout { ragged-right= ##t }
\header {
lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or
% "Special output" might be more adequate -jm
\relative c' {
\set Staff.instrumentName = #"bla"
c1
- d
+ d1
\grace c16 e1
\key d \major
- f \break
+ f1 \break
\clef bass
- g,
- fis
+ g,1
+ fis1
}
}
doctitle = "Creating simultaneous rehearsal marks"
}
-% Thanks to Risto Vääräniemi for this snippet
+% LSR: Thanks to Risto Vääräniemi for this snippet
{
\key a \major
\once \override Score.RehearsalMark #'outside-staff-priority = #5000
\once \override Score.RehearsalMark #'self-alignment-X = #LEFT
\once \override Score.RehearsalMark #'break-align-symbols = #'(key-signature)
- \mark \markup { \bold "Senza denti" }
+ \mark \markup { \bold { Senza denti } }
% the hidden measure and bar line
\once \override Score.TimeSignature #'stencil = ##f
\time 4/4
\once \override Score.RehearsalMark #'self-alignment-X = #LEFT
\once \override Score.RehearsalMark #'break-align-symbols = #'(bar-line)
- \mark \markup { \box \bold "Intro" }
+ \mark \markup { \box \bold Intro }
d'1
\mark \default
d'1
c'1
}
>>
- \layout {}
+ \layout { }
}
\score {
\new PianoStaff <<
c'1
}
>>
- \layout {}
+ \layout { }
}
}
\header {
lsrtags = "expressive-marks"
texidoc = "Arrows can be applied to text-spanners and line-spanners
-(such as the Glissando)"
+(such as the Glissando)."
doctitle = "Line arrows"
}
lsrtags = "pitches"
texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
microtonal alterations. Consult the initialization file
-@code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly})
-for details of pitch names and alterations.
-"
+@code{makam-init.ly) (see the `Learning Manual @version{},
+4.6.3 Other sources of information' for the location of this file)
+for details of pitch names and alterations."
doctitle = "Makam"
}
'extra-offset '(-3.5 . -4.5))
a^2^"m.d."
}
- \layout { ragged-right = ##t}
+ \layout { }
}
}
\score {
- \context Lyrics {
+ \new Lyrics {
\override Score.RehearsalMark #'self-alignment-X = #LEFT
\mark #(ly:export (string-append "Processed with LilyPond version "
(lilypond-version)))
\new Staff = "upper" << \upper \dynamics \pedal >>
\new Staff = "lower" << \lower \dynamics \pedal >>
>>
- \midi {}
+ \midi { }
}
\addQuote clarinet {
\transposition bes
- \repeat unfold 8 { d'16 d'16 d'8 }
+ \repeat unfold 8 { d'16 d' d'8 }
}
\addQuote sax {
<<
\new Staff {
- \set Staff.instrumentName = "quoteMe"
+ \set Staff.instrumentName = #"quoteMe"
\quoteMe
}
\new Staff {
- \set Staff.instrumentName = "orig"
+ \set Staff.instrumentName = #"orig"
\original
}
\new Staff \relative c'' <<
- \set Staff.instrumentName = "orig+quote"
+ \set Staff.instrumentName = #"orig+quote"
\set Staff.quotedEventTypes = #'(note-event articulation-event)
\original
\new Voice {
\header {
lsrtags = "paper-and-layout"
texidoc = "A table of contents is included using
-@code{\\markuplines \\table-of-contents}. The TOC items are added with
-the @code{\\tocItem} command."
+@w{@code{\\markuplines \\table-of-contents}}. The TOC items are
+added with the @code{\\tocItem} command."
doctitle = "Table of contents"
}
(ly:music?)
(naturalize m))
-music = \relative c' { c4 d e g }
+music = \relative c' { c4 d e g }
\score {
\new Staff {
\transpose c deses \music
\naturalizeMusic \transpose c deses \music
}
- \layout {}
+ \layout { }
}
\version "2.11.23"
-\layout { ragged-right= ##t }
\header {
lsrtags = "tweaks-and-overrides"
texidoc = "
With the @code{\\tweak} command, every grob can be tuned directly. Here
are some examples of available tweaks.
"
- doctitle = "Using the @code{\tweak} command to tweak individual grobs"
+ doctitle = "Using the @code{\\tweak} command to tweak individual grobs"
}
\relative c' {
-\version "2.11.36"
-\layout { ragged-right= ##t }
+\version "2.11.47"
\header {
lsrtags = "repeats,staff-notation,chords"
texidoc = "By adding the @code{Volta_engraver} to the relevant
doctitle = "Volta under chords"
}
-% chords above volta
\score {
<<
\chords {
c1
- c
- }
- \new Staff \with { \consists Volta_engraver } {
- \repeat volta 2 { c'1 }
- \alternative { c' }
- }
+ c1
+ }
+ \new Staff \with { \consists "Volta_engraver" } {
+ \repeat volta 2 { c'1 }
+ \alternative { c' }
+ }
>>
\layout {
\context {
\Score
- \remove Volta_engraver
+ \remove "Volta_engraver"
}
}
}
-
}
voltaMusic = \relative c'' {
- \repeat volta 2
+ \repeat volta 2 {
c1
- \alternative {
+ }
+ \alternative {
d1
e
- }
+ }
}
<<
--- /dev/null
+\version "2.11.48"
+
+\header {
+ lsrtags = "repeats"
+ texidoc = "Though volte are best specified using
+@code{\\repeat volta}, the context property @code{repeatCommands}
+must be used in cases where the volta text needs more advanced
+formatting with @code{\\markup}.
+
+Since @code{repeatCommands} takes a list, the simplest method of
+including markup is to use an identifier for the text and embed
+it in the command list using the Scheme syntax
+@w{@code{#(list (list 'volta textIdentifier))}}. Start- and end-repeat commands
+can be added as separate list elements:"
+doctitle = "Volta text markup using @code{\\repeatCommands}"
+}
+
+voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
+
+\relative c'' {
+ c1
+ \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat)
+ c4 b d e
+ \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat)
+ f1
+ \set Score.repeatCommands = #'((volta #f))
+}
\version "2.10.19"
\header {
- texidoc = "extenders will not protude into the right margin"
+ texidoc = "Extenders will not protrude into the right margin"
}
\score{
e d c
}
}
-
-}
-\paper {
- ragged-right = ##t
-}
+}
\ No newline at end of file
--- /dev/null
+\version "2.11.48"
+
+\header {
+ texidoc = "Volte using @code{repeatCommands} can have markup
+text."
+}
+
+voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
+
+\relative c'' {
+ c1
+ \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat)
+ c4 b d e
+ \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat)
+ f1
+ \set Score.repeatCommands = #'((volta #f))
+}
struct Lookup
{
static Stencil dot (Offset p, Real radius);
- static Stencil bracket (Axis a, Interval iv, Real thick, Real protude, Real blot);
+ static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm);
static Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
static Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
static Stencil slur (Bezier controls, Real cthick, Real thick);
static Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve);
static Stencil beam (Real slope, Real width, Real thick, Real blot);
- static Stencil dashed_slur (Bezier, Real thick, Real dash_period, Real dash_fraction);
+ static Stencil dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction);
static Stencil blank (Box b);
static Stencil filled_box (Box b);
static Stencil round_filled_box (Box b, Real blotdiameter);
static Stencil repeat_slash (Real w, Real slope, Real th);
static Stencil horizontal_line (Interval w, Real th);
- static Stencil triangle (Interval, Real, Real);
+ static Stencil triangle (Interval iv, Real thick, Real protrude);
static Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
};
}
Stencil
-Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
+Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot)
{
Box b;
Axis other = Axis ((a + 1)%2);
Stencil m = round_filled_box (b, blot);
b[a] = Interval (iv[UP] - thick, iv[UP]);
- Interval oi = Interval (-thick / 2, thick / 2 + fabs (protude));
- oi *= sign (protude);
+ Interval oi = Interval (-thick / 2, thick / 2 + fabs (protrude));
+ oi *= sign (protrude);
b[other] = oi;
m.add_stencil (round_filled_box (b, blot));
b[a] = Interval (iv[DOWN], iv[DOWN] + thick);
}
Stencil
-Lookup::triangle (Interval iv, Real thick, Real protude)
+Lookup::triangle (Interval iv, Real thick, Real protrude)
{
Box b;
b[X_AXIS] = Interval (0, iv.length ());
- b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude));
+ b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
vector<Offset> points;
points.push_back (Offset (iv[LEFT], 0));
points.push_back (Offset (iv[RIGHT], 0));
- points.push_back (Offset (iv.center (), protude));
+ points.push_back (Offset (iv.center (), protrude));
return points_to_line_stencil (thick, points);
4, 0, 0,
(SCM a, SCM iv, SCM t, SCM p),
"Make a bracket in direction@tie{}@var{a}. The extent of the"
- " bracket is given by @var{iv}. The wings protude by an amount"
+ " bracket is given by @var{iv}. The wings protrude by an amount"
" of@tie{}@var{p}, which may be negative. The thickness is given"
" by@tie{}@var{t}.")
{
textSpannerNeutral = \revert TextSpanner #'direction
+
+bassFigureExtendersOn = {
+ \set useBassFigureExtenders = ##t
+ \set Staff.useBassFigureExtenders = ##t
+}
+
+bassFigureExtendersOff = {
+ \set useBassFigureExtenders = ##f
+ \set Staff.useBassFigureExtenders = ##f
+}
+
+bassFigureStaffAlignmentDown = {
+ \override Staff.BassFigureAlignmentPositioning #'direction = #DOWN
+}
+
+bassFigureStaffAlignmentUp = {
+ \override Staff.BassFigureAlignmentPositioning #'direction = #UP
+}
+
+bassFigureStaffAlignmentNeutral = {
+ \revert Staff.BassFigureAlignmentPositioning #'direction
+}
+
save twiddle_thick, stem_thick, cheek_thick, cheek_width;
save fill_up, straigh_len;
save serif, dishing_angle, p, tmp;
- save cheek_medium, left_serif_protude, right_serif_protude;
+ save cheek_medium, left_serif_protrude, right_serif_protrude;
save lower_overshoot;
save blot_t, corner_t;
path serif, p;
stem_thick = 2/6 ex;
cheek_thick = 13/32 ex;
cheek_width = 0.72 ex;
- left_serif_protude = 18/60 ex;
- right_serif_protude = 15/60 ex;
+ left_serif_protrude = 18/60 ex;
+ right_serif_protrude = 15/60 ex;
currenttransform := currenttransform slanted slant;
pickup pencircle scaled serif_thick;
- lft x11 = -left_serif_protude;
- rt x10 = stem_thick + right_serif_protude;
+ lft x11 = -left_serif_protrude;
+ rt x10 = stem_thick + right_serif_protrude;
bot y10 = bot y11 = -descender;
z15 = z6l + up * fill_up;
def draw_bass_clef (expr exact_center, reduction) =
save reduced_ss, swoosh_width;
- save right_thickness, right_offset, tip_protude;
+ save right_thickness, right_offset, tip_protrude;
save dot_diam, bulb_y_offset, bulb_flare;
- pair tip_protude;
+ pair tip_protrude;
reduced_ss# = staff_space# * reduction;
2.2 dot_diam# = reduction * (staff_space# - stafflinethickness#);
right_offset = 0.05 staff_space;
bulb_y_offset := 0.075 staff_space;
bulb_flare := 2.5 linethickness;
-% tip_protude := (-linethickness, -.2 staff_space);
- tip_protude := (0, 0);
+% tip_protrude := (-linethickness, -.2 staff_space);
+ tip_protrude := (0, 0);
set_char_box (-xpart exact_center,
xpart exact_center + swoosh_width# + 7/12 reduced_ss#,
% optical correction: the top dot seems farther away if y3l = 0.
y3l = right_offset;
- z4 = -(0, 2.0 reduced_ss) + tip_protude;
+ z4 = -(0, 2.0 reduced_ss) + tip_protrude;
penpos3 (whatever, 185);
penpos4 (linethickness, 135);
% * The inside curve of the C is rather straight.
% * The outside curve of the C is rather round.
% * Right tips of the C point slightly outward.
-% * Lower tip protudes to the right very slightly.
+% * Lower tip protrudes to the right very slightly.
%
def draw_C =
(default-direction ,ly:dir? "Direction determined by note head
positions.")
(digit-names ,vector "Names for string finger digits.")
- (direction ,ly:dir? "If @code{side-axis} is @code{1} (or
+ (direction ,ly:dir? "If @code{side-axis} is @code{0} (or
@code{#X}), then this property determines whether the object is placed
@code{#LEFT}, @code{#CENTER} or @code{#RIGHT} with respect to the
other object. Otherwise, it determines whether the object is placed
@code{#UP}, @code{#CENTER} or @code{#DOWN}. Numerical values may also
be used: @code{#UP}=@code{1}, @code{#DOWN}=@code{-1},
-@code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0}
-but also other numerical values are permitted.")
+@code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0}.")
(dot-color ,symbol? "Color of dots. Options include
@code{black} and @code{white}.")
(dot-count ,integer? "The number of dots.")
order a script is within a stack of scripts.")
(self-alignment-X ,number? "Specify alignment of an object. The
value @code{-1} means left aligned, @code{0}@tie{}centered, and
-@code{1}@tie{}right-aligned in X@tie{}direction. Values in-between
-may also be specified.")
+@code{1}@tie{}right-aligned in X@tie{}direction. Other numerical
+values may also be specified.")
(self-alignment-Y ,number? "Like @code{self-alignment-X} but for
the Y@tie{}axis.")
(shorten-pair ,number-pair? "The lengths to shorten a
(thickness . 1.6) ;; line-thickness
(edge-height . (2.0 . 2.0)) ;; staff-space;
(font-size . -4)
+ (word-space . 0.6)
(direction . ,UP)
(meta . ((class . Spanner)
(interfaces . (volta-bracket-interface
projects / lilypond.git / commitdiff