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 {
+ \\override #'(thickness . 2)
+ \\underline {
+ CONTENTS
+ }
}
@end lilypond"
(let* ((thick (* (ly:output-def-lookup layout 'line-thickness)
makes possible to define another shape for the corners (default is 1).
@lilypond[quote,verbatim,fragment,relative=2]
-c^\\markup \\rounded-box { Overtura }
+c4^\\markup {
+ \\rounded-box {
+ Overtura
+ }
+}
c,8. c16 c4 r
@end lilypond"
(let ((th (* (ly:output-def-lookup layout 'line-thickness)
\\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)
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 {
+ A simple line of text
+ }
}
@end lilypond"
(let ((stencils (interpret-markup-list layout props args)))
equivalent to @code{\"fi\"}.
@lilypond[verbatim,quote]
-\\markup \\bold {
- au
- \\concat {
- Mouv
- \\super t
+\\markup {
+ \\bold {
+ au
+ \\concat {
+ Mouv
+ \\super
+ t
+ }
}
}
@end lilypond"
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)
Put @code{args} in a centered column.
@lilypond[verbatim,quote]
-\\markup \\center-align {
- one
- two
- three
+\\markup {
+ \\center-align {
+ one
+ two
+ three
+ }
}
@end lilypond"
(let* ((mols (interpret-markup-list layout props args))
Align @code{arg} to its X@tie{}center.
@lilypond[verbatim,quote]
-\\markup \\column {
- ↓
- \\hcenter
- centered
+\\markup {
+ \\column {
+ ↓
+ \\hcenter
+ centered
+ }
}
@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 {
+ ↓
+ \\right-align
+ right-aligned
+ }
}
@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 {
+ ↓
+ \\left-align
+ left-aligned
+ }
}
@end lilypond"
(let* ((m (interpret-markup layout props arg)))
alignment accordingly.
@lilypond[verbatim,quote]
-\\markup \\column {
- ↓
- \\halign #LEFT
- Left
- ↓
- \\halign #CENTER
- Center
- ↓
- \\halign #RIGHT
- Right
- ↓
- \\halign #1.2
- \\line { Arbitrary alignment }
+\\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)))
"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)
"Increase the font size relative to current setting.
@lilypond[verbatim,quote]
-\\markup \\bigger {
- Voici venir les temps où vibrant sur sa tige
+\\markup {
+ \\huge {
+ huge
+ \\hspace #2
+ \\bigger {
+ bigger
+ }
+ \\hspace #2
+ huge
+ }
}
@end lilypond"
(interpret-markup layout props
"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"
()
"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
(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))
"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 ""))))
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)
}
@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"
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))
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)))
projects / lilypond.git / blobdiff