"
@cindex drawing lines within text
-A simple line."
+A simple line.
+@lilypond[verbatim,quote]
+\\markup {
+ \\draw-line #'(4 . 4)
+ \\override #'(thickness . 5)
+ \\draw-line #'(-3 . 0)
+}
+@end lilypond"
(let ((th (* (ly:output-def-lookup layout 'line-thickness)
thickness))
(x (car dest))
optionally filled.
@lilypond[verbatim,quote]
-\\markup { \\draw-circle #2 #0.5 ##f \\hspace #2 \\draw-circle #2 #0 ##t }
+\\markup {
+ \\draw-circle #2 #0.5 ##f
+ \\hspace #2
+ \\draw-circle #2 #0 ##t
+}
@end lilypond"
(make-circle-stencil radius thickness fill))
A triangle, either filled or empty.
@lilypond[verbatim,quote]
-\\markup { \\triangle ##t \\hspace #2 \\triangle ##f }
+\\markup {
+ \\triangle ##t
+ \\hspace #2
+ \\triangle ##f
+}
@end lilypond"
(let ((ex (* (magstep font-size) 0.8 baseline-skip)))
(ly:make-stencil
Draw a circle around @var{arg}. Use @code{thickness},
@code{circle-padding} and @code{font-size} properties to determine line
-thickness and padding around the markup."
+thickness and padding around the markup.
+
+@lilypond[verbatim,quote]
+\\markup \\circle { Hi }
+@end lilypond"
(let ((th (* (ly:output-def-lookup layout 'line-thickness)
thickness))
(pad (* (magstep font-size) circle-padding))
"
@cindex drawing beams within text
-Create a beam with the specified parameters."
+Create a beam with the specified parameters.
+@lilypond[verbatim,quote]
+\\markup \\beam #5 #1 #2
+@end lilypond"
(let* ((y (* slope width))
(yext (cons (min 0 y) (max 0 y)))
(half (/ thickness 2)))
(define-builtin-markup-command (underline layout props arg)
(markup?)
- music
+ font
((thickness 1))
"
@cindex underlining text
Underline @var{arg}. Looks at @code{thickness} to determine line
-thickness and y offset."
+thickness and y offset.
+
+@lilypond[verbatim,quote]
+\\markup \\override #'(thickness . 2) \\underline {
+ CONTENTS
+}
+@end lilypond"
(let* ((thick (* (ly:output-def-lookup layout 'line-thickness)
thickness))
(markup (interpret-markup layout props arg))
Draw a box round @var{arg}. Looks at @code{thickness},
@code{box-padding} and @code{font-size} properties to determine line
-thickness and padding around the markup."
+thickness and padding around the markup.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\override #'(box-padding . 0.5)
+ \\box
+ \\line { V. S. }
+}
+@end lilypond"
(let* ((th (* (ly:output-def-lookup layout 'line-thickness)
thickness))
(pad (* (magstep font-size) box-padding))
\\filled-box #'(0 . 4) #'(0 . 4) #0
\\filled-box #'(0 . 2) #'(-4 . 2) #0.4
\\filled-box #'(1 . 8) #'(0 . 7) #0.2
- \\with-color #white \\filled-box #'(-4.5 . -2.5) #'(3.5 . 5.5) #0.7
+ \\with-color #white
+ \\filled-box #'(-4.5 . -2.5) #'(3.5 . 5.5) #0.7
}
@end lilypond"
(ly:round-filled-box
makes possible to define another shape for the corners (default is 1).
@lilypond[quote,verbatim,fragment,relative=2]
-c^\\markup{ \\rounded-box Overtura }
+c^\\markup \\rounded-box { Overtura }
c,8. c16 c4 r
@end lilypond"
(let ((th (* (ly:output-def-lookup layout 'line-thickness)
"
@cindex creating horizontal spaces in text
-This produces a invisible object taking horizontal space. For example,
+This produces an invisible object taking horizontal space. For example,
@example
-\\markup @{ A \\hspace #2.0 B @}
+\\markup @{ A \\hspace #2.0 B @}
@end example
@noindent
puts extra space between A and@tie{}B, on top of the space that is
-normally inserted before elements on a line."
+normally inserted before elements on a line.
+
+@lilypond[verbatim,quote]
+\\markup {
+ one
+ \\hspace #2
+ two
+ \\hspace #8
+ three
+}
+@end lilypond"
(if (> amount 0)
(ly:make-stencil "" (cons 0 amount) '(-1 . 1))
(ly:make-stencil "" (cons amount amount) '(-1 . 1))))
"
@cindex creating empty text objects
-An empty markup with extents of a single point."
+An empty markup with extents of a single point.
+
+@lilypond[verbatim,quote]
+\\markup \\null
+@end lilypond"
point-stencil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@cindex simple text strings
A simple text string; @code{\\markup @{ foo @}} is equivalent with
-@code{\\markup @{ \\simple #\"foo\" @}}."
+@code{\\markup @{ \\simple #\"foo\" @}}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\simple #\"simple\"
+ \\simple #\"text\"
+ \\simple #\"strings\"
+}
+@end lilypond"
(interpret-markup layout props str))
(define-builtin-markup-command (tied-lyric layout props str)
"
@cindex simple text strings with tie characters
-Like simple-markup, but use tie characters for @q{~} tilde symbols."
+Like simple-markup, but use tie characters for @q{~} tilde symbols.
+
+@lilypond[verbatim,quote]
+\\markup \\tied-lyric #\"Lasciate~i monti\"
+@end lilypond"
(if (string-contains str "~")
(let*
((parts (string-split str #\~))
(line-width #f))
"Put @var{markups} in a horizontal line of width @var{line-width}.
The markups are spaced or flushed to fill the entire line.
-If there are no arguments, return an empty stencil."
-
+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 }
+ }
+}
+@end lilypond"
(let* ((orig-stencils (interpret-markup-list layout props markups))
(stencils
(map (lambda (stc)
((word-space)
(text-direction RIGHT))
"Put @var{args} in a horizontal line. The property @code{word-space}
-determines the space between each markup in @var{args}."
+determines the space between each markup in @var{args}.
+
+@lilypond[verbatim,quote]
+\\markup \\line {
+ A simple line of text
+}
+@end lilypond"
(let ((stencils (interpret-markup-list layout props args)))
(if (= text-direction LEFT)
(set! stencils (reverse stencils)))
Concatenate @var{args} in a horizontal line, without spaces inbetween.
Strings and simple markups are concatenated on the input level, allowing
ligatures. For example, @code{\\concat @{ \"f\" \\simple #\"i\" @}} is
-equivalent to @code{\"fi\"}."
+equivalent to @code{\"fi\"}.
+
+@lilypond[verbatim,quote]
+\\markup \\bold {
+ au
+ \\concat {
+ Mouv
+ \\super t
+ }
+}
+@end lilypond"
(define (concat-string-args arg-list)
(fold-right (lambda (arg result-list)
(let ((result (if (pair? result-list)
\\markup {
\\fontsize #5
\\override #'(thickness . 2)
- \\combine \\draw-line #'(0 . 4) \\arrow-head #Y #DOWN ##f
+ \\combine
+ \\draw-line #'(0 . 4)
+ \\arrow-head #Y #DOWN ##f
}
@end lilypond"
(let* ((s1 (interpret-markup layout props m1))
@cindex stacking text in a column
Stack the markups in @var{args} vertically. The property
-@code{baseline-skip} determines the space between each markup in @var{args}."
+@code{baseline-skip} determines the space between each
+markup in @var{args}.
+
+@lilypond[verbatim,quote]
+\\markup \\column {
+ one
+ two
+ three
+}
+@end lilypond"
(let ((arg-stencils (interpret-markup-list layout props args)))
(stack-lines -1 0.0 baseline-skip
(remove ly:stencil-empty? arg-stencils))))
@cindex changing direction of text columns
Make a column of args, going up or down, depending on the setting
-of the @code{#'direction} layout property."
+of the @code{#'direction} layout property.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\override #'(direction . 1)
+ \\dir-column { going up }
+ \\dir-column { going down }
+}
+@end lilypond"
(stack-lines (if (number? direction) direction -1)
0.0
baseline-skip
"
@cindex centering a column of text
-Put @code{args} in a centered column."
+Put @code{args} in a centered column.
+
+@lilypond[verbatim,quote]
+\\markup \\center-align {
+ 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)))
"
@cindex vertically centering text
-Align @code{arg} to its Y@tie{}center."
+Align @code{arg} to its Y@tie{}center.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\arrow-head #X #RIGHT ##f
+ \\vcenter
+ Centered
+ \\arrow-head #X #LEFT ##f
+}
+@end lilypond"
(let* ((mol (interpret-markup layout props arg)))
(ly:stencil-aligned-to mol Y CENTER)))
"
@cindex horizontally centering text
-Align @code{arg} to its X@tie{}center."
+Align @code{arg} to its X@tie{}center.
+
+@lilypond[verbatim,quote]
+\\markup \\column {
+ ↓
+ \\hcenter
+ centered
+}
+@end lilypond"
(let* ((mol (interpret-markup layout props arg)))
(ly:stencil-aligned-to mol X CENTER)))
"
@cindex right aligning text
-Align @var{arg} on its right edge."
+Align @var{arg} on its right edge.
+
+@lilypond[verbatim,quote]
+\\markup \\column {
+ ↓
+ \\right-align
+ right-aligned
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg)))
(ly:stencil-aligned-to m X RIGHT)))
"
@cindex left aligning text
-Align @var{arg} on its left edge."
+Align @var{arg} on its left edge.
+
+@lilypond[verbatim,quote]
+\\markup \\column {
+ ↓
+ \\left-align
+ left-aligned
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg)))
(ly:stencil-aligned-to m X LEFT)))
@cindex setting horizontal text alignment
Set horizontal alignment. If @var{dir} is @code{-1}, then it is
-left-aligned, while @code{+1} is right. Values inbetween interpolate
-alignment accordingly."
+left-aligned, while @code{+1} is right. Values in between interpolate
+alignment accordingly.
+
+@lilypond[verbatim,quote]
+\\markup \\column {
+ ↓
+ \\halign #LEFT
+ Left
+ ↓
+ \\halign #CENTER
+ Center
+ ↓
+ \\halign #RIGHT
+ Right
+ ↓
+ \\halign #1.2
+ \\line { Arbitrary alignment }
+}
+@end lilypond"
(let* ((m (interpret-markup layout props arg)))
(ly:stencil-aligned-to m X dir)))
(markup?)
font
()
- "Increase the font size relative to current setting."
+ "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)))
(markup?)
font
()
- "Decrease the font size relative to current setting."
+ "Decrease the font size relative to current setting.
+
+@lilypond[verbatim,quote]
+\\markup \\fontsize #3 {
+ some large text
+ \\hspace #2
+ \\smaller {
+ a bit smaller
+ }
+}
+@end lilypond"
(interpret-markup layout props
`(,fontsize-markup -1 ,arg)))
-(define-builtin-markup-command larger
+(define-builtin-markup-command (larger layout props arg)
(markup?)
font
- bigger-markup)
+ ()
+ "Copy of the @code{\\bigger} command.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\larger
+ larger
+}
+@end lilypond"
+ (interpret-markup layout props (make-bigger-markup 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)
((font-size 0)
(word-space 1)
(baseline-skip 2))
- "Add @var{increment} to the font-size. Adjust baseline skip accordingly."
+ "Add @var{increment} to the font-size. Adjust baseline skip accordingly.
+@lilypond[verbatim,quote]
+\\markup \\fontsize #-1.5 {
+ Valse mélancolique et langoureux vertige!
+}
+@end lilypond"
(let ((entries (list
(cons 'baseline-skip (* baseline-skip (magstep increment)))
(cons 'word-space (* word-space (magstep increment)))
@end example
Note: Magnification only works if a font name is explicitly selected.
-Use @code{\\fontsize} otherwise."
+Use @code{\\fontsize} otherwise.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\magnify #1.5 {
+ 50% larger
+ }
+}
+@end lilypond"
(interpret-markup
layout
(prepend-alist-chain 'font-size (magnification->font-size sz) props)
(markup?)
font
()
- "Switch to bold font-series."
+ "Switch to bold font-series.
+
+@lilypond[verbatim,quote]
+\\markup \\bold {
+ Chaque fleur s'évapore ainsi qu'un encensoir
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-series 'bold props) arg))
(define-builtin-markup-command (sans layout props arg)
(markup?)
font
()
- "Switch to the sans serif family."
+ "Switch to the sans serif family.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\sans {
+ sans serif
+ }
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-family 'sans props) arg))
(define-builtin-markup-command (number layout 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))
(markup?)
font
()
- "Set font family to @code{roman}."
+ "Set font family to @code{roman}.
+
+@lilypond[verbatim,quote]
+\\markup \\sans \\bold {
+ bold sans serif
+ \\hspace #2
+ \\roman {
+ text in roman font family
+ }
+ \\hspace #2
+ return to sans
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-family 'roman props) arg))
(define-builtin-markup-command (huge layout props arg)
(markup?)
font
()
- "Set font size to +2."
+ "Set font size to +2.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\huge
+ huge
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-size 2 props) arg))
(define-builtin-markup-command (large layout props arg)
(markup?)
font
()
- "Set font size to +1."
+ "Set font size to +1.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\large
+ large
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-size 1 props) arg))
(define-builtin-markup-command (normalsize layout props arg)
(markup?)
font
()
- "Set font size to default."
+ "Set font size to default.
+
+@lilypond[verbatim,quote]
+\\markup \\teeny {
+ this is very small
+ \\hspace #1
+ \\normalsize {
+ revert to normal size
+ }
+ \\hspace #1
+ teeny again
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-size 0 props) arg))
(define-builtin-markup-command (small layout props arg)
(markup?)
font
()
- "Set font size to -1."
+ "Set font size to -1.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\small
+ small
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-size -1 props) arg))
(define-builtin-markup-command (tiny layout props arg)
(markup?)
font
()
- "Set font size to -2."
+ "Set font size to -2.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\tiny
+ tiny
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-size -2 props) arg))
(define-builtin-markup-command (teeny layout props arg)
(markup?)
font
()
- "Set font size to -3."
+ "Set font size to -3.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\teeny
+ teeny
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-size -3 props) arg))
(define-builtin-markup-command (fontCaps layout props arg)
(markup?)
font
()
- "Set @code{font-shape} to @code{caps}."
+ "Set @code{font-shape} to @code{caps}"
(interpret-markup layout (prepend-alist-chain 'font-shape 'caps props) arg))
;; Poor man's caps
(markup?)
font
()
- "Turn @code{text}, which should be a string, to small caps.
-@example
-\\markup \\smallCaps \"Text between double quotes\"
-@end example
+ "Emit @var{arg} as small caps.
-Note: @code{\\smallCaps} does not support accented characters."
+Note: @code{\\smallCaps} does not support accented characters.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\smallCaps {
+ Text in small caps
+ }
+}
+@end lilypond"
(define (char-list->markup chars lower)
(let ((final-string (string-upcase (reverse-list->string chars))))
(if lower
(markup?)
font
()
- "Emit @var{arg} as small caps."
+ "Copy of the @code{\\smallCaps} command.
+
+@lilypond[verbatim,quote]
+\\markup \\caps {
+ Les sons et les parfums tournent dans l'air du soir
+}
+@end lilypond"
(interpret-markup layout props (make-smallCaps-markup arg)))
(define-builtin-markup-command (dynamic layout props 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))
(markup?)
font
()
- "Use a text font instead of music symbol or music alphabet font."
+ "Use a text font instead of music symbol or music alphabet font.
+
+@lilypond[verbatim,quote]
+\\markup \\number {
+ 1, 2,
+ \\text {
+ three, four,
+ }
+ 5
+}
+@end lilypond"
;; ugh - latin1
(interpret-markup layout (prepend-alist-chain 'font-encoding 'latin1 props)
"Use italic @code{font-shape} for @var{arg}.
@lilypond[verbatim,quote]
-\\markup \\italic { scherzando e leggiero }
+\\markup \\italic {
+ scherzando e leggiero
+}
@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg))
(markup?)
font
()
- "Use @code{font-family} typewriter for @var{arg}."
+ "Use @code{font-family} typewriter for @var{arg}.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\hspace #2
+ \\typewriter
+ typewriter
+}
+@end lilypond"
(interpret-markup
layout (prepend-alist-chain 'font-family 'typewriter props) arg))
(markup?)
font
()
- "Set font shape to @code{upright}. This is the opposite of @code{italic}."
+ "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
+ }
+ \\hspace #2
+ italic again
+}
+@end lilypond"
(interpret-markup
layout (prepend-alist-chain 'font-shape 'upright props) arg))
(markup?)
font
()
- "Switch to medium font series (in contrast to bold)."
+ "Switch to medium font series (in contrast to bold).
+
+@lilypond[verbatim,quote]
+\\markup \\bold {
+ some bold text
+ \\hspace #2
+ \\medium {
+ medium font series
+ }
+ \\hspace #2
+ bold again
+}
+@end lilypond"
(interpret-markup layout (prepend-alist-chain 'font-series 'medium props)
arg))
font
()
"Set all font related properties (except the size) to get the default
-normal text font, no matter what font was used earlier."
+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
+ }
+ \\hspace #2
+ More text
+}
+@end lilypond"
;; ugh - latin1
(interpret-markup layout
(cons '((font-family . roman) (font-shape . upright)
\\musicglyph #\"clefs.G_change\"
}
@end lilypond"
- (ly:font-get-glyph
- (ly:paper-get-font layout (cons '((font-encoding . fetaMusic))
- props))
- glyph-name))
+ (let* ((font (ly:paper-get-font layout
+ (cons '((font-encoding . fetaMusic)
+ (font-name . #f))
+
+ props)))
+ (glyph (ly:font-get-glyph font glyph-name)))
+ (if (null? (ly:stencil-expr glyph))
+ (ly:warning (_ "Cannot find glyph ~a") glyph-name))
+
+ glyph))
+
(define-builtin-markup-command (lookup layout props glyph-name)
(string?)
other
()
- "Lookup a glyph by name."
+ "Lookup a glyph by name.
+
+@lilypond[verbatim,quote]
+\\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)
glyph-name))
(skipping letter@tie{}I), and continue with double letters.
@lilypond[verbatim,quote]
-\\markup { \\markletter #8 \\hspace #2 \\markletter #26 }
+\\markup {
+ \\markletter #8
+ \\hspace #2
+ \\markletter #26
+}
@end lilypond"
(ly:text-interface::interpret-markup layout props
(number->markletter-string number->mark-letter-vector num)))
and continue with double letters.
@lilypond[verbatim,quote]
-\\markup { \\markalphabet #8 \\hspace #2 \\markalphabet #26 }
+\\markup {
+ \\markalphabet #8
+ \\hspace #2
+ \\markalphabet #26
+}
@end lilypond"
(ly:text-interface::interpret-markup layout props
(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)))
+ (else (interval-widen number-interval (* mag 0.25))))
+ (cond ((= num 6) (interval-widen number-interval (* mag 0.5)))
+ ;((= num 5) (interval-widen number-interval (* mag 0.5)))
+ (else (interval-widen number-interval (* mag 0.25))))
+ ))
+
+(define-public (adjust-slash-stencil num forward stencil mag)
+ (if forward
+ (cond ((= num 2)
+ (ly:stencil-translate stencil (cons (* mag -0.00) (* mag 0.2))))
+ ((= num 3)
+ (ly:stencil-translate stencil (cons (* mag -0.00) (* mag 0.2))))
+ ;((= num 5)
+ ;(ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.07))))
+ ;((= num 7)
+ ; (ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.15))))
+ (else stencil))
+ (cond ((= num 6)
+ (ly:stencil-translate stencil (cons (* mag -0.00) (* mag 0.15))))
+ ;((= num 8)
+ ; (ly:stencil-translate stencil (cons (* mag -0.00) (* mag -0.15))))
+ (else stencil))
+ )
+)
+
+(define (slashed-digit-internal layout props num forward font-size thickness)
+ (let* ((mag (magstep font-size))
+ (thickness (* mag
+ (ly:output-def-lookup layout 'line-thickness)
+ thickness))
+ ; backward slashes might use slope and point in the other direction!
+ (dy (* mag (if forward 0.4 -0.4)))
+ (number-stencil (interpret-markup layout
+ (prepend-alist-chain 'font-encoding 'fetaNumber props)
+ (number->string num)))
+ (num-x (horizontal-slash-interval num forward (ly:stencil-extent number-stencil X) mag))
+ (center (interval-center (ly:stencil-extent number-stencil Y)))
+ ; Use the real extents of the slash, not the whole number, because we
+ ; might translate the slash later on!
+ (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)
+ #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
+ ; the slashed digit look better
+ (set! slash-stencil (adjust-slash-stencil num forward slash-stencil mag))
+ (set! number-stencil
+ (ly:stencil-add number-stencil slash-stencil)))
+ (ly:warning "Unable to create slashed digit ~a" num))
+ number-stencil))
+
+
(define-builtin-markup-command (slashed-digit layout props num)
(integer?)
other
\\slashed-digit #7
}
@end lilypond"
- (let* ((mag (magstep font-size))
- (thickness (* mag
- (ly:output-def-lookup layout 'line-thickness)
- thickness))
- (dy (* mag 0.15))
- (number-stencil (interpret-markup layout
- (prepend-alist-chain 'font-encoding 'fetaNumber props)
- (number->string num)))
- (num-x (interval-widen (ly:stencil-extent number-stencil X)
- (* mag 0.2)))
- (num-y (ly:stencil-extent number-stencil Y))
- (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)
- #f)))
- (set! slash-stencil
- (cond ((not (ly:stencil? slash-stencil)) #f)
- ((= num 5)
- (ly:stencil-translate slash-stencil
- ;;(cons (* mag -0.05) (* mag 0.42))
- (cons (* mag -0.00) (* mag -0.07))))
- ((= num 7)
- (ly:stencil-translate slash-stencil
- ;;(cons (* mag -0.05) (* mag 0.42))
- (cons (* mag -0.00) (* mag -0.15))))
- (else slash-stencil)))
- (if slash-stencil
- (set! number-stencil
- (ly:stencil-add number-stencil slash-stencil))
- (ly:warning "invalid number for slashed digit ~a" num))
- number-stencil))
+ (slashed-digit-internal layout props num #t font-size thickness))
+\f
+(define-builtin-markup-command (backslashed-digit layout props num)
+ (integer?)
+ other
+ ((font-size 0)
+ (thickness 1.6))
+ "
+@cindex backslashed digits
+
+A feta number, with backslash. This is for use in the context of
+figured bass notation.
+@lilypond[verbatim,quote]
+\\markup {
+ \\backslashed-digit #5
+ \\hspace #2
+ \\override #'(thickness . 3)
+ \\backslashed-digit #7
+}
+@end lilypond"
+ (slashed-digit-internal layout props num #f font-size thickness))
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; the note command.
@cindex notes within text by log and dot-count
Construct a note symbol, with stem. By using fractional values for
-@var{dir}, you can obtain longer or shorter stems."
+@var{dir}, you can obtain longer or shorter stems.
+@lilypond[verbatim,quote]
+\\markup {
+ \\note-by-number #3 #0 #DOWN
+ \\hspace #1
+ \\note-by-number #1 #2 #0.8
+}
+@end lilypond"
(define (get-glyph-name-candidates dir log style)
(map (lambda (dir-name)
(format "noteheads.~a~a~a" dir-name (min log 2)
This produces a note with a stem pointing in @var{dir} direction, with
the @var{duration} for the note head type and augmentation dots. For
example, @code{\\note #\"4.\" #-0.75} creates a dotted quarter note, with
-a shortened down stem."
+a shortened down stem.
+
+@lilypond[verbatim,quote]
+\\markup {
+ \\override #'(style . cross)
+ \\note #\"4..\" #UP
+ \\hspace #1
+ \\note #\"breve\" #0
+}
+@end lilypond"
(let ((parsed (parse-simple-duration duration)))
(note-by-number-markup layout props (car parsed) (cadr parsed) dir)))
\f
Make a fraction of two markups.
@lilypond[verbatim,quote]
-\\markup { π ≈ \\fraction 355 113 }
+\\markup {
+ π ≈
+ \\fraction 355 113
+}
@end lilypond"
(let* ((m1 (interpret-markup layout props arg1))
(m2 (interpret-markup layout props arg2))
"
@cindex setting superscript in standard font size
-Set @var{arg} in superscript with a normal font size."
+Set @var{arg} in superscript with a normal font size.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\normal-size-super {
+ superscript in standard size
+ }
+}
+@end lilypond"
(ly:stencil-translate-axis
(interpret-markup layout props arg)
(* 0.5 baseline-skip) Y))
@code{\\sub}:
@lilypond[verbatim,quote]
-\\markup { E = \\concat { mc \\super 2 } }
+\\markup {
+ E =
+ \\concat {
+ mc
+ \\super
+ 2
+ }
+}
@end lilypond"
(ly:stencil-translate-axis
(interpret-markup
"
@cindex subscript text
-Set @var{arg} in subscript."
+Set @var{arg} in subscript.
+
+@lilypond[verbatim,quote]
+\\markup \\concat {
+ H
+ \\sub 2
+ O
+}
+@end lilypond"
(ly:stencil-translate-axis
(interpret-markup
layout
"
@cindex setting subscript in standard font size
-Set @var{arg} in subscript, in a normal font size."
+Set @var{arg} in subscript, in a normal font size.
+
+@lilypond[verbatim,quote]
+\\markup {
+ default
+ \\normal-size-sub {
+ subscript in standard size
+ }
+}
+@end lilypond"
(ly:stencil-translate-axis
(interpret-markup layout props arg)
(* -0.5 baseline-skip)
"
@cindex placing horizontal brackets around text
-Draw horizontal brackets around @var{arg}."
+Draw horizontal brackets around @var{arg}.
+
+@lilypond[verbatim,quote]
+\\markup \\hbracket \\line {
+ one two three
+}
+@end lilypond"
(let ((th 0.1) ;; todo: take from GROB.
(m (interpret-markup layout props arg)))
(bracketify-stencil m X th (* 2.5 th) th)))
"
@cindex placing vertical brackets around text
-Draw vertical brackets around @var{arg}."
+Draw vertical brackets around @var{arg}.
+
+@lilypond[verbatim,quote]
+\\markup \\bracket \\note #\"2.\" #UP
+@end lilypond"
(let ((th 0.1) ;; todo: take from GROB.
(m (interpret-markup layout props arg)))
(bracketify-stencil m Y th (* 2.5 th) th)))
;; Markup list commands
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-public (space-lines baseline-skip lines)
- (map (lambda (line)
- (stack-lines DOWN 0.0 (/ baseline-skip 2.0)
- (list point-stencil
- line
- point-stencil)))
- lines))
+(define-public (space-lines baseline stils)
+ (let space-stil ((prev-stil #f)
+ (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)))))))
(define-builtin-markup-list-command (justified-lines layout props args)
(markup-list?)
projects / lilypond.git / blobdiff