thickness))
(x (car dest))
(y (cdr dest)))
- (ly:make-stencil
- `(draw-line
- ,th
- 0 0
- ,x ,y)
- (cons (min x 0) (max x 0))
- (cons (min y 0) (max y 0)))))
+ (make-line-stencil th 0 0 x y)))
(define-builtin-markup-command (draw-circle layout props radius thickness fill)
(number? number? boolean?)
thickness and padding around the markup.
@lilypond[verbatim,quote]
-\\markup \\circle { Hi }
+\\markup {
+ \\circle {
+ Hi
+ }
+}
@end lilypond"
(let ((th (* (ly:output-def-lookup layout 'line-thickness)
thickness))
@lilypond[verbatim,quote]
\\markup {
\\with-url #\"http://lilypond.org/web/\" {
- LilyPond ... \\italic { music notation for everyone }
+ LilyPond ... \\italic {
+ music notation for everyone
+ }
}
}
@end lilypond"
Create a beam with the specified parameters.
@lilypond[verbatim,quote]
-\\markup \\beam #5 #1 #2
+\\markup {
+ \\beam #5 #1 #2
+}
@end lilypond"
(let* ((y (* slope width))
(yext (cons (min 0 y) (max 0 y)))
thickness and y offset.
@lilypond[verbatim,quote]
-\\markup \\override #'(thickness . 2) \\underline {
- CONTENTS
+\\markup {
+ default
+ \\hspace #2
+ \\override #'(thickness . 2)
+ \\underline {
+ underline
+ }
}
@end lilypond"
(let* ((thick (* (ly:output-def-lookup layout 'line-thickness)
(x1 (car (ly:stencil-extent markup X)))
(x2 (cdr (ly:stencil-extent markup X)))
(y (* thick -2))
- (line (ly:make-stencil
- `(draw-line ,thick ,x1 ,y ,x2 ,y)
- (cons (min x1 0) (max x2 0))
- (cons thick thick))))
+ (line (make-line-stencil thick x1 y x2 y)))
(ly:stencil-add markup line)))
(define-builtin-markup-command (box layout props arg)
(corner-radius 1)
(font-size 0)
(box-padding 0.5))
- "@cindex enclosing text in a bow with rounded corners
+ "@cindex enclosing text in a box with rounded corners
@cindex drawing boxes with rounded corners around text
Draw a box with rounded corners around @var{arg}. Looks at @code{thickness},
@code{box-padding} and @code{font-size} properties to determine line
thickness and padding around the markup; the @code{corner-radius} property
-makes possible to define another shape for the corners (default is 1).
+makes it possible to define another shape for the corners (default is 1).
-@lilypond[quote,verbatim,fragment,relative=2]
-c^\\markup \\rounded-box { Overtura }
+@lilypond[quote,verbatim,relative=2]
+c4^\\markup {
+ \\rounded-box {
+ Overtura
+ }
+}
c,8. c16 c4 r
@end lilypond"
(let ((th (* (ly:output-def-lookup layout 'line-thickness)
"
@cindex rotating text
-Rotate object with @var{ang} degrees around its center."
+Rotate object with @var{ang} degrees around its center.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\rotate #45
+ \\line {
+ rotated 45°
+ }
+}
+@end lilypond"
(let* ((stil (interpret-markup layout props arg)))
(ly:stencil-rotate stil ang 0 0)))
"
@cindex adding a white background to text
-Provide a white background for @var{arg}."
+Provide a white background for @var{arg}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\combine
+ \\filled-box #'(-1 . 10) #'(-3 . 4) #1
+ \\whiteout whiteout
+}
+@end lilypond"
(stencil-whiteout (interpret-markup layout props arg)))
(define-builtin-markup-command (pad-markup layout props padding arg)
@cindex padding text
@cindex putting space around text
-Add space around a markup object."
+Add space around a markup object.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\box {
+ default
+ }
+ \\hspace #2
+ \\box {
+ \\pad-around #1 {
+ padded
+ }
+ }
+}
+@end lilypond"
(let*
((stil (interpret-markup layout props arg))
(xext (ly:stencil-extent stil X))
"
@cindex importing stencils into text
-Use a stencil as markup."
+Use a stencil as markup.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\stencil #(make-circle-stencil 2 0 #t)
+}
+@end lilypond"
stil)
(define bbox-regexp
\\postscript #eyeglassesps
}
-\\relative c'' { c2^\\eyeglasses a_\\eyeglasses }
+\\relative c'' {
+ c2^\\eyeglasses
+ a2_\\eyeglasses
+}
@end lilypond"
;; FIXME
(ly:make-stencil
An empty markup with extents of a single point.
@lilypond[verbatim,quote]
-\\markup \\null
+\\markup {
+ \\null
+}
@end lilypond"
point-stencil)
A simple text string; @code{\\markup @{ foo @}} is equivalent with
@code{\\markup @{ \\simple #\"foo\" @}}.
+Note: for creating standard text markup or defining new markup commands,
+the use of @code{\\simple} is unnecessary.
+
@lilypond[verbatim,quote]
\\markup {
\\simple #\"simple\"
Like simple-markup, but use tie characters for @q{~} tilde symbols.
@lilypond[verbatim,quote]
-\\markup \\tied-lyric #\"Lasciate~i monti\"
+\\markup {
+ \\tied-lyric #\"Lasciate~i monti\"
+}
@end lilypond"
(if (string-contains str "~")
(let*
If there are no arguments, return an empty stencil.
@lilypond[verbatim,quote]
-\\markup \\column {
- \\fill-line {
- Words evenly spaced across the page
- }
- \\null
- \\fill-line {
- \\line { Text markups }
- \\line \\italic { evenly spaced }
- \\line { across the page }
+\\markup {
+ \\column {
+ \\fill-line {
+ Words evenly spaced across the page
+ }
+ \\null
+ \\fill-line {
+ \\line { Text markups }
+ \\line {
+ \\italic { evenly spaced }
+ }
+ \\line { across the page }
+ }
}
}
@end lilypond"
determines the space between each markup in @var{args}.
@lilypond[verbatim,quote]
-\\markup \\line {
- A simple line of text
+\\markup {
+ \\line {
+ one two three
+ }
}
@end lilypond"
(let ((stencils (interpret-markup-list layout props args)))
equivalent to @code{\"fi\"}.
@lilypond[verbatim,quote]
-\\markup \\bold {
- au
+\\markup {
\\concat {
- Mouv
- \\super t
+ one
+ two
+ three
}
}
@end lilypond"
Like wordwrap, but with lines stretched to justify the margins.
Use @code{\\override #'(line-width . @var{X})} to set the line width;
-@var{X}@tie{}is the number of staff spaces."
+@var{X}@tie{}is the number of staff spaces.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\justify {
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
+ do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco
+ laboris nisi ut aliquip ex ea commodo consequat.
+ }
+}
+@end lilypond"
(stack-lines DOWN 0.0 baseline-skip
(wordwrap-internal-markup-list layout props #t args)))
((baseline-skip)
wordwrap-internal-markup-list)
"Simple wordwrap. Use @code{\\override #'(line-width . @var{X})} to set
-the line width, where @var{X} is the number of staff spaces."
+the line width, where @var{X} is the number of staff spaces.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\wordwrap {
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
+ do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco
+ laboris nisi ut aliquip ex ea commodo consequat.
+ }
+}
+@end lilypond"
(stack-lines DOWN 0.0 baseline-skip
(wordwrap-internal-markup-list layout props #f args)))
align
((baseline-skip)
wordwrap-string-internal-markup-list)
- "Wordwrap a string. Paragraphs may be separated with double newlines."
+ "Wordwrap a string. Paragraphs may be separated with double newlines.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\override #'(line-width . 40)
+ \\wordwrap-string #\"Lorem ipsum dolor sit amet, consectetur
+ adipisicing elit, sed do eiusmod tempor incididunt ut labore
+ et dolore magna aliqua.
+
+
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco
+ laboris nisi ut aliquip ex ea commodo consequat.
+
+
+ Excepteur sint occaecat cupidatat non proident, sunt in culpa
+ qui officia deserunt mollit anim id est laborum\"
+}
+@end lilypond"
(stack-lines DOWN 0.0 baseline-skip
(wordwrap-string-internal-markup-list layout props #f arg)))
align
((baseline-skip)
wordwrap-string-internal-markup-list)
- "Justify a string. Paragraphs may be separated with double newlines"
+ "Justify a string. Paragraphs may be separated with double newlines
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\override #'(line-width . 40)
+ \\justify-string #\"Lorem ipsum dolor sit amet, consectetur
+ adipisicing elit, sed do eiusmod tempor incididunt ut labore
+ et dolore magna aliqua.
+
+
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco
+ laboris nisi ut aliquip ex ea commodo consequat.
+
+
+ Excepteur sint occaecat cupidatat non proident, sunt in culpa
+ qui officia deserunt mollit anim id est laborum\"
+}
+@end lilypond"
(stack-lines DOWN 0.0 baseline-skip
(wordwrap-string-internal-markup-list layout props #t arg)))
(symbol?)
align
()
- "Wordwrap the data which has been assigned to @var{symbol}."
+ "Wordwrap the data which has been assigned to @var{symbol}.
+
+@lilypond[verbatim,quote]
+\\header {
+ title = \"My title\"
+ descr = \"Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+ sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+ nisi ut aliquip ex ea commodo consequat.\"
+}
+
+\\paper {
+ bookTitleMarkup = \\markup {
+ \\column {
+ \\fill-line { \\fromproperty #'header:title }
+ \\null
+ \\wordwrap-field #'header:descr
+ }
+ }
+}
+
+\\markup {
+ \\null
+}
+@end lilypond"
(let* ((m (chain-assoc-get symbol props)))
(if (string? m)
(wordwrap-string-markup layout props m)
(symbol?)
align
()
- "Justify the data which has been assigned to @var{symbol}."
+ "Justify the data which has been assigned to @var{symbol}.
+
+@lilypond[verbatim,quote]
+\\header {
+ title = \"My title\"
+ descr = \"Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+ sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+ nisi ut aliquip ex ea commodo consequat.\"
+}
+
+\\paper {
+ bookTitleMarkup = \\markup {
+ \\column {
+ \\fill-line { \\fromproperty #'header:title }
+ \\null
+ \\justify-field #'header:descr
+ }
+ }
+}
+
+\\markup {
+ \\null
+}
+@end lilypond"
(let* ((m (chain-assoc-get symbol props)))
(if (string? m)
(justify-string-markup layout props m)
@cindex merging text
Print two markups on top of each other.
+
+Note: @code{\\combine} cannot take a list of markups enclosed in
+curly braces as an argument; the follow example will not compile:
+
+@example
+\\combine @{ a list @}
+@end example
+
@lilypond[verbatim,quote]
\\markup {
\\fontsize #5
\\override #'(thickness . 2)
\\combine
- \\draw-line #'(0 . 4)
- \\arrow-head #Y #DOWN ##f
+ \\draw-line #'(0 . 4)
+ \\arrow-head #Y #DOWN ##f
}
@end lilypond"
(let* ((s1 (interpret-markup layout props m1))
markup in @var{args}.
@lilypond[verbatim,quote]
-\\markup \\column {
- one
- two
- three
+\\markup {
+ \\column {
+ one
+ two
+ three
+ }
}
@end lilypond"
(let ((arg-stencils (interpret-markup-list layout props args)))
@lilypond[verbatim,quote]
\\markup {
- \\override #'(direction . 1)
- \\dir-column { going up }
- \\dir-column { going down }
+ \\override #'(direction . 1) {
+ \\dir-column {
+ going up
+ }
+ }
+ \\dir-column {
+ going down
+ }
}
@end lilypond"
(stack-lines (if (number? direction) direction -1)
baseline-skip
(interpret-markup-list layout props args)))
-(define-builtin-markup-command (center-align layout props args)
+(define (general-column align-dir baseline mols)
+ "Stack @var{mols} vertically, aligned to @var{align-dir} horizontally."
+
+ (let* ((aligned-mols (map (lambda (x) (ly:stencil-aligned-to x X align-dir)) mols)))
+ (stack-lines -1 0.0 baseline aligned-mols)))
+
+(define-builtin-markup-command (center-column layout props args)
(markup-list?)
align
((baseline-skip))
Put @code{args} in a centered column.
@lilypond[verbatim,quote]
-\\markup \\center-align {
- one
- two
- three
+\\markup {
+ \\center-column {
+ one
+ two
+ three
+ }
}
@end lilypond"
- (let* ((mols (interpret-markup-list layout props args))
- (cmols (map (lambda (x) (ly:stencil-aligned-to x X CENTER)) mols)))
- (stack-lines -1 0.0 baseline-skip cmols)))
+ (general-column CENTER baseline-skip (interpret-markup-list layout props args)))
+
+(define-builtin-markup-command (left-column layout props args)
+ (markup-list?)
+ align
+ ((baseline-skip))
+ "
+@cindex text columns, left-aligned
+
+Put @code{args} in a left-aligned column.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\left-column {
+ one
+ two
+ three
+ }
+}
+@end lilypond"
+ (general-column LEFT baseline-skip (interpret-markup-list layout props args)))
+
+(define-builtin-markup-command (right-column layout props args)
+ (markup-list?)
+ align
+ ((baseline-skip))
+ "
+@cindex text columns, right-aligned
+
+Put @code{args} in a right-aligned column.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\right-column {
+ one
+ two
+ three
+ }
+}
+@end lilypond"
+ (general-column RIGHT baseline-skip (interpret-markup-list layout props args)))
(define-builtin-markup-command (vcenter layout props arg)
(markup?)
@lilypond[verbatim,quote]
\\markup {
- \\arrow-head #X #RIGHT ##f
+ one
\\vcenter
- Centered
- \\arrow-head #X #LEFT ##f
+ two
+ three
}
@end lilypond"
(let* ((mol (interpret-markup layout props arg)))
(ly:stencil-aligned-to mol Y CENTER)))
-(define-builtin-markup-command (hcenter layout props arg)
+(define-builtin-markup-command (center-align layout props arg)
(markup?)
align
()
Align @code{arg} to its X@tie{}center.
@lilypond[verbatim,quote]
-\\markup \\column {
- ↓
- \\hcenter
- centered
+\\markup {
+ \\column {
+ one
+ \\center-align
+ two
+ three
+ }
}
@end lilypond"
(let* ((mol (interpret-markup layout props arg)))
Align @var{arg} on its right edge.
@lilypond[verbatim,quote]
-\\markup \\column {
- ↓
- \\right-align
- right-aligned
+\\markup {
+ \\column {
+ one
+ \\right-align
+ two
+ three
+ }
}
@end lilypond"
(let* ((m (interpret-markup layout props arg)))
Align @var{arg} on its left edge.
@lilypond[verbatim,quote]
-\\markup \\column {
- ↓
- \\left-align
- left-aligned
+\\markup {
+ \\column {
+ one
+ \\left-align
+ two
+ three
+ }
}
@end lilypond"
(let* ((m (interpret-markup layout props arg)))
"
@cindex controlling general text alignment
-Align @var{arg} in @var{axis} direction to the @var{dir} side."
+Align @var{arg} in @var{axis} direction to the @var{dir} side.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\column {
+ one
+ \\general-align #X #LEFT
+ two
+ three
+ \\null
+ one
+ \\general-align #X #CENTER
+ two
+ three
+ \\null
+ \\line {
+ one
+ \\general-align #Y #UP
+ two
+ three
+ }
+ \\null
+ \\line {
+ one
+ \\general-align #Y #3.2
+ two
+ three
+ }
+ }
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg)))
(ly:stencil-aligned-to m axis dir)))
alignment accordingly.
@lilypond[verbatim,quote]
-\\markup \\column {
- ↓
- \\halign #LEFT
- Left
- ↓
- \\halign #CENTER
- Center
- ↓
- \\halign #RIGHT
- Right
- ↓
- \\halign #1.2
- \\line { Arbitrary alignment }
+\\markup {
+ \\column {
+ one
+ \\halign #LEFT
+ two
+ three
+ \\null
+ one
+ \\halign #CENTER
+ two
+ three
+ \\null
+ one
+ \\halign #RIGHT
+ two
+ three
+ \\null
+ one
+ \\halign #-5
+ two
+ three
+ }
}
@end lilypond"
(let* ((m (interpret-markup layout props arg)))
(number? markup?)
align
()
- "Add padding @var{amount} all around @var{arg}."
+ "Add padding @var{amount} all around @var{arg}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\box {
+ default
+ }
+ \\hspace #2
+ \\box {
+ \\pad-around #0.5 {
+ padded
+ }
+ }
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg))
(x (ly:stencil-extent m X))
(y (ly:stencil-extent m Y)))
"
@cindex padding text horizontally
-Add padding @var{amount} around @var{arg} in the X@tie{}direction."
+Add padding @var{amount} around @var{arg} in the X@tie{}direction.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\box {
+ default
+ }
+ \\hspace #4
+ \\box {
+ \\pad-x #2 {
+ padded
+ }
+ }
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg))
(x (ly:stencil-extent m X))
(y (ly:stencil-extent m Y)))
(interval-widen x amount)
y)))
-(define-builtin-markup-command (put-adjacent layout props arg1 axis dir arg2)
- (markup? integer? ly:dir? markup?)
+(define-builtin-markup-command (put-adjacent layout props axis dir arg1 arg2)
+ (integer? ly:dir? markup? markup?)
align
()
"Put @var{arg2} next to @var{arg1}, without moving @var{arg1}."
(markup?)
other
()
- "Make the argument transparent."
+ "Make the argument transparent.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\transparent {
+ invisible text
+ }
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg))
(x (ly:stencil-extent m X))
(y (ly:stencil-extent m Y)))
(number-pair? number-pair? markup?)
align
()
- "Make @var{arg} take at least @var{x-ext}, @var{y-ext} space."
+ "Make @var{arg} take at least @var{x-ext}, @var{y-ext} space.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\box {
+ default
+ }
+ \\hspace #4
+ \\box {
+ \\pad-to-box #'(0 . 10) #'(0 . 3) {
+ padded
+ }
+ }
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg))
(x (ly:stencil-extent m X))
(y (ly:stencil-extent m Y)))
align
()
"Center @var{arg} horizontally within a box of extending
-@var{length}/2 to the left and right."
+@var{length}/2 to the left and right.
+
+@lilypond[quote,verbatim]
+\\new StaffGroup <<
+ \\new Staff {
+ \\set Staff.instrumentName = \\markup {
+ \\hcenter-in #12
+ Oboe
+ }
+ c''1
+ }
+ \\new Staff {
+ \\set Staff.instrumentName = \\markup {
+ \\hcenter-in #12
+ Bassoon
+ }
+ \\clef tenor
+ c'1
+ }
+>>
+@end lilypond"
(interpret-markup layout props
(make-pad-to-box-markup
(cons (/ length -2) (/ length 2))
'(0 . 0)
- (make-hcenter-markup arg))))
+ (make-center-align-markup arg))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; property
()
"Read the @var{symbol} from property settings, and produce a stencil
from the markup contained within. If @var{symbol} is not defined, it
-returns an empty markup."
+returns an empty markup.
+
+@lilypond[verbatim,quote]
+\\header {
+ myTitle = \"myTitle\"
+ title = \\markup {
+ from
+ \\italic
+ \\fromproperty #'header:myTitle
+ }
+}
+\\markup {
+ \\null
+}
+@end lilypond"
(let ((m (chain-assoc-get symbol props)))
(if (markup? m)
(interpret-markup layout props m)
@example
\\override #'(font-family . married) \"bla\"
-@end example"
+@end example
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\line {
+ \\column {
+ default
+ baseline-skip
+ }
+ \\hspace #2
+ \\override #'(baseline-skip . 4) {
+ \\column {
+ increased
+ baseline-skip
+ }
+ }
+ }
+}
+@end lilypond"
(interpret-markup layout (cons (list new-prop) props) arg))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
"Read the contents of a file, and include it verbatim.
@lilypond[verbatim,quote]
-\\markup \\verbatim-file #\"simple.ly\"
+\\markup {
+ \\verbatim-file #\"simple.ly\"
+}
@end lilypond"
(interpret-markup layout props
(if (ly:get-option 'safe)
;; fonts.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-builtin-markup-command (bigger layout props arg)
- (markup?)
- font
- ()
- "Increase the font size relative to current setting.
-
-@lilypond[verbatim,quote]
-\\markup \\bigger {
- Voici venir les temps où vibrant sur sa tige
-}
-@end lilypond"
- (interpret-markup layout props
- `(,fontsize-markup 1 ,arg)))
(define-builtin-markup-command (smaller layout props arg)
(markup?)
"Decrease the font size relative to current setting.
@lilypond[verbatim,quote]
-\\markup \\fontsize #3 {
- some large text
- \\hspace #2
- \\smaller {
- a bit smaller
+\\markup {
+ \\fontsize #3.5 {
+ some large text
+ \\hspace #2
+ \\smaller {
+ a bit smaller
+ }
+ \\hspace #2
+ more large text
}
}
@end lilypond"
(markup?)
font
()
- "Copy of the @code{\\bigger} command.
+ "Increase the font size relative to current setting.
@lilypond[verbatim,quote]
\\markup {
larger
}
@end lilypond"
- (interpret-markup layout props (make-bigger-markup arg)))
+ (interpret-markup layout props
+ `(,fontsize-markup 1 ,arg)))
(define-builtin-markup-command (finger layout props arg)
(markup?)
()
"Set the argument as small numbers.
@lilypond[verbatim,quote]
-\\markup \\finger {
- 1 2 3 4 5
+\\markup {
+ \\finger {
+ 1 2 3 4 5
+ }
}
@end lilypond"
(interpret-markup layout
(cons '((font-size . -5) (font-encoding . fetaNumber)) props)
arg))
+(define-builtin-markup-command (abs-fontsize layout props size arg)
+ (number? markup?)
+ font
+ ()
+ "Use @var{size} as the absolute font size to display @var{arg}.
+Adjust baseline skip and word space accordingly.
+@lilypond[verbatim,quote]
+\\markup {
+ default text font size
+ \\hspace #2
+ \\abs-fontsize #16 { text font size 16 }
+ \\hspace #2
+ \\abs-fontsize #12 { text font size 12 }
+}
+@end lilypond"
+ (let* ((ref-size (ly:output-def-lookup layout 'text-font-size 12))
+ (text-props (list (ly:output-def-lookup layout 'text-font-defaults)))
+ (ref-word-space (chain-assoc-get 'word-space text-props 0.6))
+ (ref-baseline (chain-assoc-get 'baseline-skip text-props 3))
+ (magnification (/ size ref-size)))
+ (interpret-markup layout
+ (cons `((baseline-skip . ,(* magnification ref-baseline))
+ (word-space . ,(* magnification ref-word-space))
+ (font-size . ,(magnification->font-size magnification)))
+ props)
+ arg)))
+
(define-builtin-markup-command (fontsize layout props increment arg)
(number? markup?)
font
(baseline-skip 2))
"Add @var{increment} to the font-size. Adjust baseline skip accordingly.
@lilypond[verbatim,quote]
-\\markup \\fontsize #-1.5 {
- Valse mélancolique et langoureux vertige!
+\\markup {
+ default
+ \\hspace #2
+ \\fontsize #-1.5
+ smaller
}
@end lilypond"
(let ((entries (list
"Switch to bold font-series.
@lilypond[verbatim,quote]
-\\markup \\bold {
- Chaque fleur s'évapore ainsi qu'un encensoir
+\\markup {
+ default
+ \\hspace #2
+ \\bold
+ bold
}
@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-series 'bold props) arg))
some punctuation. It doesn't have any letters.
@lilypond[verbatim,quote]
-\\markup \\number {
- 0 1 2 3 4 5 6 7 8 9 . ,
+\\markup {
+ \\number {
+ 0 1 2 3 4 5 6 7 8 9 . ,
+ }
}
@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaNumber props) arg))
"Set font family to @code{roman}.
@lilypond[verbatim,quote]
-\\markup \\sans \\bold {
- bold sans serif
- \\hspace #2
- \\roman {
- text in roman font family
+\\markup {
+ \\sans \\bold {
+ sans serif, bold
+ \\hspace #2
+ \\roman {
+ text in roman font family
+ }
+ \\hspace #2
+ return to sans
}
- \\hspace #2
- return to sans
}
@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-family 'roman props) arg))
"Set font size to default.
@lilypond[verbatim,quote]
-\\markup \\teeny {
- this is very small
- \\hspace #1
- \\normalsize {
- revert to normal size
+\\markup {
+ \\teeny {
+ this is very small
+ \\hspace #2
+ \\normalsize {
+ normal size
+ }
+ \\hspace #2
+ teeny again
}
- \\hspace #1
- teeny again
}
@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-size 0 props) arg))
(markup?)
font
()
- "Set @code{font-shape} to @code{caps}"
+ "Set @code{font-shape} to @code{caps}
+
+Note: @code{\\fontCaps} requires the installation and selection of
+fonts which support the @code{caps} font shape."
(interpret-markup layout (prepend-alist-chain 'font-shape 'caps props) arg))
;; Poor man's caps
"Copy of the @code{\\smallCaps} command.
@lilypond[verbatim,quote]
-\\markup \\caps {
- Les sons et les parfums tournent dans l'air du soir
+\\markup {
+ default
+ \\hspace #2
+ \\caps {
+ Text in small caps
+ }
}
@end lilypond"
(interpret-markup layout props (make-smallCaps-markup arg)))
@q{pi@`{u}@tie{}@b{f}}, the normal words (like @q{pi@`{u}}) should be
done in a different font. The recommended font for this is bold and italic.
@lilypond[verbatim,quote]
-\\markup \\dynamic { sfzp }
+\\markup {
+ \\dynamic {
+ sfzp
+ }
+}
@end lilypond"
(interpret-markup
layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))
"Use a text font instead of music symbol or music alphabet font.
@lilypond[verbatim,quote]
-\\markup \\number {
- 1, 2,
- \\text {
- three, four,
+\\markup {
+ \\number {
+ 1, 2,
+ \\text {
+ three, four,
+ }
+ 5
}
- 5
}
@end lilypond"
"Use italic @code{font-shape} for @var{arg}.
@lilypond[verbatim,quote]
-\\markup \\italic {
- scherzando e leggiero
+\\markup {
+ default
+ \\hspace #2
+ \\italic
+ italic
}
@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg))
"Set font shape to @code{upright}. This is the opposite of @code{italic}.
@lilypond[verbatim,quote]
-\\markup \\italic {
- italic text
- \\hspace #2
- \\upright {
- upright text
+\\markup {
+ \\italic {
+ italic text
+ \\hspace #2
+ \\upright {
+ upright text
+ }
+ \\hspace #2
+ italic again
}
- \\hspace #2
- italic again
}
@end lilypond"
(interpret-markup
"Switch to medium font series (in contrast to bold).
@lilypond[verbatim,quote]
-\\markup \\bold {
- some bold text
- \\hspace #2
- \\medium {
- medium font series
+\\markup {
+ \\bold {
+ some bold text
+ \\hspace #2
+ \\medium {
+ medium font series
+ }
+ \\hspace #2
+ bold again
}
- \\hspace #2
- bold again
}
@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-series 'medium props)
normal text font, no matter what font was used earlier.
@lilypond[verbatim,quote]
-\\markup \\huge \\bold \\sans \\caps {
- Some text with font overrides
- \\hspace #2
- \\normal-text {
- Default text, same font-size
+\\markup {
+ \\huge \\bold \\sans \\caps {
+ Some text with font overrides
+ \\hspace #2
+ \\normal-text {
+ Default text, same font-size
+ }
+ \\hspace #2
+ More text as before
}
- \\hspace #2
- More text
}
@end lilypond"
;; ugh - latin1
"Draw a double sharp symbol.
@lilypond[verbatim,quote]
-\\markup { \\doublesharp }
+\\markup {
+ \\doublesharp
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get 1 standard-alteration-glyph-name-alist ""))))
"Draw a 3/2 sharp symbol.
@lilypond[verbatim,quote]
-\\markup { \\sesquisharp }
+\\markup {
+ \\sesquisharp
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get 3/4 standard-alteration-glyph-name-alist ""))))
"Draw a sharp symbol.
@lilypond[verbatim,quote]
-\\markup { \\sharp }
+\\markup {
+ \\sharp
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get 1/2 standard-alteration-glyph-name-alist ""))))
"Draw a semi sharp symbol.
@lilypond[verbatim,quote]
-\\markup { \\semisharp }
+\\markup {
+ \\semisharp
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get 1/4 standard-alteration-glyph-name-alist ""))))
"Draw a natural symbol.
@lilypond[verbatim,quote]
-\\markup { \\natural }
+\\markup {
+ \\natural
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get 0 standard-alteration-glyph-name-alist ""))))
"Draw a semiflat symbol.
@lilypond[verbatim,quote]
-\\markup { \\semiflat }
+\\markup {
+ \\semiflat
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get -1/4 standard-alteration-glyph-name-alist ""))))
"Draw a flat symbol.
@lilypond[verbatim,quote]
-\\markup { \\flat }
+\\markup {
+ \\flat
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get -1/2 standard-alteration-glyph-name-alist ""))))
"Draw a 3/2 flat symbol.
@lilypond[verbatim,quote]
-\\markup { \\sesquiflat }
+\\markup {
+ \\sesquiflat
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get -3/4 standard-alteration-glyph-name-alist ""))))
"Draw a double flat symbol.
@lilypond[verbatim,quote]
-\\markup { \\doubleflat }
+\\markup {
+ \\doubleflat
+}
@end lilypond"
(interpret-markup layout props (markup #:musicglyph (assoc-get -1 standard-alteration-glyph-name-alist ""))))
"
@cindex coloring text
-Draw @var{arg} in color specified by @var{color}."
+Draw @var{arg} in color specified by @var{color}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\with-color #red
+ red
+ \\hspace #2
+ \\with-color #green
+ green
+ \\hspace #2
+ \\with-color #blue
+ blue
+}
+@end lilypond"
(let ((stil (interpret-markup layout props arg)))
(ly:make-stencil (list 'color color (ly:stencil-expr stil))
(ly:stencil-extent stil X)
Use the filled head if @var{filled} is specified.
@lilypond[verbatim,quote]
\\markup {
- \\fontsize #5
- \\general-align #Y #DOWN {
- \\arrow-head #Y #UP ##t
- \\arrow-head #Y #DOWN ##f
- \\hspace #2
- \\arrow-head #X #RIGHT ##f
- \\arrow-head #X #LEFT ##f
+ \\fontsize #5 {
+ \\general-align #Y #DOWN {
+ \\arrow-head #Y #UP ##t
+ \\arrow-head #Y #DOWN ##f
+ \\hspace #2
+ \\arrow-head #X #RIGHT ##f
+ \\arrow-head #X #LEFT ##f
+ }
}
}
@end lilypond"
"Lookup a glyph by name.
@lilypond[verbatim,quote]
-\\markup \\override #'(font-encoding . fetaBraces) {
- \\lookup #\"brace200\"
- \\hspace #2
- \\rotate #180
- \\lookup #\"brace180\"
+\\markup {
+ \\override #'(font-encoding . fetaBraces) {
+ \\lookup #\"brace200\"
+ \\hspace #2
+ \\rotate #180
+ \\lookup #\"brace180\"
+ }
}
@end lilypond"
(ly:font-get-glyph (ly:paper-get-font layout props)
other
()
"Produce a single character. For example, @code{\\char #65} produces the
-letter @q{A}."
+letter @q{A}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\char #65
+}
+@end lilypond"
(ly:text-interface::interpret-markup layout props (ly:wide-char->utf-8 num)))
(define number->mark-letter-vector (make-vector 25 #\A))
(number->markletter-string number->mark-alphabet-vector num)))
(define-public (horizontal-slash-interval num forward number-interval mag)
- (ly:message "Mag step: ~a" mag)
(if forward
(cond ;((= num 6) (interval-widen number-interval (* mag 0.5)))
;((= num 5) (interval-widen number-interval (* mag 0.5)))
(num-y (interval-widen (cons center center) (abs dy)))
(is-sane (and (interval-sane? num-x) (interval-sane? num-y)))
(slash-stencil (if is-sane
- (ly:make-stencil
- `(draw-line ,thickness
- ,(car num-x) ,(- (interval-center num-y) dy)
- ,(cdr num-x) ,(+ (interval-center num-y) dy))
- num-x num-y)
+ (make-line-stencil thickness
+ (car num-x) (- (interval-center num-y) dy)
+ (cdr num-x) (+ (interval-center num-y) dy))
#f)))
-(ly:message "Num: ~a, X-interval: ~a" num num-x)
(if (ly:stencil? slash-stencil)
(begin
; for some numbers we need to shift the slash/backslash up or down to make
}
@end lilypond"
(slashed-digit-internal layout props num #t font-size thickness))
-\f
+
(define-builtin-markup-command (backslashed-digit layout props num)
(integer?)
other
}
@end lilypond"
(slashed-digit-internal layout props num #f font-size thickness))
-\f
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; the note command.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@lilypond[verbatim,quote]
\\markup {
\\note-by-number #3 #0 #DOWN
- \\hspace #1
+ \\hspace #2
\\note-by-number #1 #2 #0.8
}
@end lilypond"
@lilypond[verbatim,quote]
\\markup {
- \\override #'(style . cross)
- \\note #\"4..\" #UP
- \\hspace #1
+ \\override #'(style . cross) {
+ \\note #\"4..\" #UP
+ }
+ \\hspace #2
\\note #\"breve\" #0
}
@end lilypond"
(let ((parsed (parse-simple-duration duration)))
(note-by-number-markup layout props (car parsed) (cadr parsed) dir)))
-\f
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; translating.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@cindex lowering text
Lower @var{arg} by the distance @var{amount}.
-A negative @var{amount} indicates raising; see also @code{\\raise}."
+A negative @var{amount} indicates raising; see also @code{\\raise}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ one
+ \\lower #3
+ two
+ three
+}
+@end lilypond"
(ly:stencil-translate-axis (interpret-markup layout props arg)
(- amount) Y))
(define-builtin-markup-command (translate-scaled layout props offset arg)
(number-pair? markup?)
- other
+ align
((font-size 0))
"
@cindex translating text
@cindex scaling text
Translate @var{arg} by @var{offset}, scaling the offset by the
-@code{font-size}."
+@code{font-size}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\fontsize #5 {
+ * \\translate #'(2 . 3) translate
+ \\hspace #2
+ * \\translate-scaled #'(2 . 3) translate-scaled
+ }
+}
+@end lilypond"
(let* ((factor (magstep font-size))
(scaled (cons (* factor (car offset))
(* factor (cdr offset)))))
and/or @code{extra-offset} properties.
@lilypond[verbatim,quote]
-\\markup { C \\small \\raise #1.0 \\bold 9/7+ }
+\\markup {
+ C
+ \\small
+ \\bold
+ \\raise #1.0
+ 9/7+
+}
@end lilypond"
(ly:stencil-translate-axis (interpret-markup layout props arg) amount Y))
This moves @q{B C} 2@tie{}spaces to the right, and 3 down, relative to its
surroundings. This command cannot be used to move isolated scripts
vertically, for the same reason that @code{\\raise} cannot be used for
-that."
- (ly:stencil-translate (interpret-markup layout props arg)
+that.
+
+@lilypond[verbatim,quote]
+\\markup {
+ *
+ \\translate #'(2 . 3)
+ \\line { translated two spaces right, three up }
+}
+@end lilypond"
+ (ly:stencil-translate (interpret-markup layout props arg)
offset))
(define-builtin-markup-command (sub layout props arg)
Set @var{arg} in subscript.
@lilypond[verbatim,quote]
-\\markup \\concat {
- H
- \\sub 2
- O
+\\markup {
+ \\concat {
+ H
+ \\sub {
+ 2
+ }
+ O
+ }
}
@end lilypond"
(ly:stencil-translate-axis
Draw horizontal brackets around @var{arg}.
@lilypond[verbatim,quote]
-\\markup \\hbracket \\line {
- one two three
+\\markup {
+ \\hbracket {
+ \\line {
+ one two three
+ }
+ }
}
@end lilypond"
(let ((th 0.1) ;; todo: take from GROB.
Draw vertical brackets around @var{arg}.
@lilypond[verbatim,quote]
-\\markup \\bracket \\note #\"2.\" #UP
+\\markup {
+ \\bracket {
+ \\note #\"2.\" #UP
+ }
+}
@end lilypond"
(let ((th 0.1) ;; todo: take from GROB.
(m (interpret-markup layout props arg)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-public (space-lines baseline stils)
- (let space-stil ((prev-stil #f)
- (stils stils)
+ (let space-stil ((stils stils)
(result (list)))
- (cond ((null? stils)
- (reverse! result))
- ((not prev-stil)
- (space-stil (car stils) (cdr stils) (list (car stils))))
- (else
- (let* ((stil (car stils))
- (dy (max (- baseline
- (+ (- (interval-bound (ly:stencil-extent prev-stil Y) DOWN))
- (interval-bound (ly:stencil-extent stil Y) UP)))
- 0.0))
- (new-stil (ly:make-stencil
- (ly:stencil-expr stil)
- (ly:stencil-extent stil X)
- (cons (interval-bound (ly:stencil-extent stil Y) DOWN)
- (+ (interval-bound (ly:stencil-extent stil Y) UP) dy)))))
- (space-stil stil (cdr stils) (cons new-stil result)))))))
+ (if (null? stils)
+ (reverse! result)
+ (let* ((stil (car stils))
+ (dy-top (max (- (/ baseline 1.5)
+ (interval-bound (ly:stencil-extent stil Y) UP))
+ 0.0))
+ (dy-bottom (max (+ (/ baseline 3.0)
+ (interval-bound (ly:stencil-extent stil Y) DOWN))
+ 0.0))
+ (new-stil (ly:make-stencil
+ (ly:stencil-expr stil)
+ (ly:stencil-extent stil X)
+ (cons (- (interval-bound (ly:stencil-extent stil Y) DOWN)
+ dy-bottom)
+ (+ (interval-bound (ly:stencil-extent stil Y) UP)
+ dy-top)))))
+ (space-stil (cdr stils) (cons new-stil result))))))
(define-builtin-markup-list-command (justified-lines layout props args)
(markup-list?)
projects / lilypond.git / blobdiff