[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/4] Use new definitions of define-builtin-markup{, -list}-comman
|
From: |
David Kastrup |
|
Subject: |
[PATCH 4/4] Use new definitions of define-builtin-markup{, -list}-command |
|
Date: |
Mon, 23 Nov 2009 01:03:13 +0100 |
All markup commands defined with these macros must be adapted to the
new syntax.
---
scm/define-markup-commands.scm | 449 ++++++++++++++++------------------------
scm/fret-diagrams.scm | 18 +-
scm/harp-pedals.scm | 8 +-
scm/tablature.scm | 3 +-
4 files changed, 196 insertions(+), 282 deletions(-)
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 9628774..123c487 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -117,8 +117,8 @@
(define-builtin-markup-command (draw-line layout props dest)
(number-pair?)
- graphic
- ((thickness 1))
+ #:category graphic
+ #:properties ((thickness 1))
"
@cindex drawing lines within text
@@ -138,8 +138,7 @@ A simple line.
(define-builtin-markup-command (draw-circle layout props radius thickness
filled)
(number? number? boolean?)
- graphic
- ()
+ #:category graphic
"
@cindex drawing circles within text
@@ -157,10 +156,10 @@ optionally filled.
(define-builtin-markup-command (triangle layout props filled)
(boolean?)
- graphic
- ((thickness 0.1)
- (font-size 0)
- (baseline-skip 2))
+ #:category graphic
+ #:properties ((thickness 0.1)
+ (font-size 0)
+ (baseline-skip 2))
"
@cindex drawing triangles within text
@@ -186,10 +185,10 @@ A triangle, either filled or empty.
(define-builtin-markup-command (circle layout props arg)
(markup?)
- graphic
- ((thickness 1)
- (font-size 0)
- (circle-padding 0.2))
+ #:category graphic
+ #:properties ((thickness 1)
+ (font-size 0)
+ (circle-padding 0.2))
"
@cindex circling text
@@ -212,8 +211,7 @@ thickness and padding around the markup.
(define-builtin-markup-command (with-url layout props url arg)
(string? markup?)
- graphic
- ()
+ #:category graphic
"
@cindex inserting URL links into text
@@ -239,8 +237,7 @@ the PDF backend.
(define-builtin-markup-command (beam layout props width slope thickness)
(number? number? number?)
- graphic
- ()
+ #:category graphic
"
@cindex drawing beams within text
@@ -268,8 +265,8 @@ Create a beam with the specified parameters.
(define-builtin-markup-command (underline layout props arg)
(markup?)
- font
- ((thickness 1))
+ #:category font
+ #:properties ((thickness 1))
"
@cindex underlining text
@@ -297,10 +294,10 @@ thickness and y-offset.
(define-builtin-markup-command (box layout props arg)
(markup?)
- font
- ((thickness 1)
- (font-size 0)
- (box-padding 0.2))
+ #:category font
+ #:properties ((thickness 1)
+ (font-size 0)
+ (box-padding 0.2))
"
@cindex enclosing text within a box
@@ -323,8 +320,7 @@ thickness and padding around the markup.
(define-builtin-markup-command (filled-box layout props xext yext blot)
(number-pair? number-pair? number?)
- graphic
- ()
+ #:category graphic
"
@cindex drawing solid boxes within text
@cindex drawing boxes with rounded corners
@@ -352,11 +348,11 @@ circle of address@hidden (i.e., sharp corners).
(define-builtin-markup-command (rounded-box layout props arg)
(markup?)
- graphic
- ((thickness 1)
- (corner-radius 1)
- (font-size 0)
- (box-padding 0.5))
+ #:category graphic
+ #:properties ((thickness 1)
+ (corner-radius 1)
+ (font-size 0)
+ (box-padding 0.5))
"@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},
@@ -381,8 +377,7 @@ c,8. c16 c4 r
(define-builtin-markup-command (rotate layout props ang arg)
(number? markup?)
- align
- ()
+ #:category align
"
@cindex rotating text
@@ -403,8 +398,7 @@ Rotate object with @var{ang} degrees around its center.
(define-builtin-markup-command (whiteout layout props arg)
(markup?)
- other
- ()
+ #:category other
"
@cindex adding a white background to text
@@ -421,8 +415,7 @@ Provide a white background for @var{arg}.
(define-builtin-markup-command (pad-markup layout props amount arg)
(number? markup?)
- align
- ()
+ #:category align
"
@cindex padding text
@cindex putting space around text
@@ -458,8 +451,7 @@ Add space around a markup object.
(define-builtin-markup-command (strut layout props)
()
- other
- ()
+ #:category other
"
@cindex creating vertical spaces in text
@@ -473,8 +465,7 @@ Create a box of the same height as the space in the current
font."
;; todo: fix negative space
(define-builtin-markup-command (hspace layout props amount)
(number?)
- align
- ()
+ #:category align
"
@cindex creating horizontal spaces in text
@@ -496,8 +487,7 @@ Create an invisible object taking up horizontal space
@var{amount}.
;; todo: fix negative space
(define-builtin-markup-command (vspace layout props amount)
(number?)
- align
- ()
+ #:category align
"
@cindex creating vertical spaces in text
@@ -527,8 +517,7 @@ of @var{amount} multiplied by 3.
(define-builtin-markup-command (stencil layout props stil)
(ly:stencil?)
- other
- ()
+ #:category other
"
@cindex importing stencils into text
@@ -558,8 +547,7 @@ Use a stencil as markup.
(define-builtin-markup-command (epsfile layout props axis size file-name)
(number? number? string?)
- graphic
- ()
+ #:category graphic
"
@cindex inlining an Encapsulated PostScript image
@@ -581,8 +569,7 @@ Inline an EPS image. The image is scaled along @var{axis}
to
(define-builtin-markup-command (postscript layout props str)
(string?)
- graphic
- ()
+ #:category graphic
"
@cindex inserting PostScript directly into text
This inserts @var{str} directly into the output as a PostScript
@@ -622,8 +609,8 @@ grestore
(define-builtin-markup-command (score layout props score)
(ly:score?)
- music
- ((baseline-skip))
+ #:category music
+ #:properties ((baseline-skip))
"
@cindex inserting music into text
@@ -681,8 +668,7 @@ Inline an image of music.
(define-builtin-markup-command (null layout props)
()
- other
- ()
+ #:category other
"
@cindex creating empty text objects
@@ -701,8 +687,7 @@ An empty markup with extents of a single point.
(define-builtin-markup-command (simple layout props str)
(string?)
- font
- ()
+ #:category font
"
@cindex simple text strings
@@ -723,8 +708,7 @@ the use of @code{\\simple} is unnecessary.
(define-builtin-markup-command (tied-lyric layout props str)
(string?)
- music
- ()
+ #:category music
"
@cindex simple text strings with tie characters
@@ -785,10 +769,10 @@ Like simple-markup, but use tie characters for @q{~}
tilde symbols.
(define-builtin-markup-command (fill-line layout props args)
(markup-list?)
- align
- ((text-direction RIGHT)
- (word-space 1)
- (line-width #f))
+ #:category align
+ #:properties ((text-direction RIGHT)
+ (word-space 1)
+ (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.
@@ -860,9 +844,9 @@ If there are no arguments, return an empty stencil.
(define-builtin-markup-command (line layout props args)
(markup-list?)
- align
- ((word-space)
- (text-direction RIGHT))
+ #:category align
+ #:properties ((word-space)
+ (text-direction RIGHT))
"Put @var{args} in a horizontal line. The property @code{word-space}
determines the space between markups in @var{args}.
@@ -882,8 +866,7 @@ determines the space between markups in @var{args}.
(define-builtin-markup-command (concat layout props args)
(markup-list?)
- align
- ()
+ #:category align
"
@cindex concatenating text
@cindex ligatures in text
@@ -977,9 +960,9 @@ equivalent to @code{\"fi\"}.
(define-builtin-markup-list-command (wordwrap-internal layout props justify
args)
(boolean? markup-list?)
- ((line-width #f)
- (word-space)
- (text-direction RIGHT))
+ #:properties ((line-width #f)
+ (word-space)
+ (text-direction RIGHT))
"Internal markup list command used to define @code{\\justify} and
@code{\\wordwrap}."
(wordwrap-stencils (remove ly:stencil-empty?
(interpret-markup-list layout props args))
@@ -991,9 +974,9 @@ equivalent to @code{\"fi\"}.
(define-builtin-markup-command (justify layout props args)
(markup-list?)
- align
- ((baseline-skip)
- wordwrap-internal-markup-list)
+ #:category align
+ #:properties ((baseline-skip)
+ wordwrap-internal-markup-list)
"
@cindex justifying text
@@ -1016,9 +999,9 @@ Use @code{\\override #'(line-width . @var{X})} to set the
line width;
(define-builtin-markup-command (wordwrap layout props args)
(markup-list?)
- align
- ((baseline-skip)
- wordwrap-internal-markup-list)
+ #:category align
+ #:properties ((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.
@@ -1037,9 +1020,9 @@ the line width, where @var{X} is the number of staff
spaces.
(define-builtin-markup-list-command (wordwrap-string-internal layout props
justify arg)
(boolean? string?)
- ((line-width)
- (word-space)
- (text-direction RIGHT))
+ #:properties ((line-width)
+ (word-space)
+ (text-direction RIGHT))
"Internal markup list command used to define @code{\\justify-string} and
@code{\\wordwrap-string}."
(let* ((para-strings (regexp-split
@@ -1064,9 +1047,9 @@ the line width, where @var{X} is the number of staff
spaces.
(define-builtin-markup-command (wordwrap-string layout props arg)
(string?)
- align
- ((baseline-skip)
- wordwrap-string-internal-markup-list)
+ #:category align
+ #:properties ((baseline-skip)
+ wordwrap-string-internal-markup-list)
"Wordwrap a string. Paragraphs may be separated with double newlines.
@lilypond[verbatim,quote]
@@ -1090,9 +1073,9 @@ the line width, where @var{X} is the number of staff
spaces.
(define-builtin-markup-command (justify-string layout props arg)
(string?)
- align
- ((baseline-skip)
- wordwrap-string-internal-markup-list)
+ #:category align
+ #:properties ((baseline-skip)
+ wordwrap-string-internal-markup-list)
"Justify a string. Paragraphs may be separated with double newlines
@lilypond[verbatim,quote]
@@ -1116,8 +1099,7 @@ the line width, where @var{X} is the number of staff
spaces.
(define-builtin-markup-command (wordwrap-field layout props symbol)
(symbol?)
- align
- ()
+ #:category align
"Wordwrap the data which has been assigned to @var{symbol}.
@lilypond[verbatim,quote]
@@ -1150,8 +1132,7 @@ the line width, where @var{X} is the number of staff
spaces.
(define-builtin-markup-command (justify-field layout props symbol)
(symbol?)
- align
- ()
+ #:category align
"Justify the data which has been assigned to @var{symbol}.
@lilypond[verbatim,quote]
@@ -1184,8 +1165,7 @@ the line width, where @var{X} is the number of staff
spaces.
(define-builtin-markup-command (combine layout props arg1 arg2)
(markup? markup?)
- align
- ()
+ #:category align
"
@cindex merging text
@@ -1216,8 +1196,8 @@ curly braces as an argument; the follow example will not
compile:
;;
(define-builtin-markup-command (column layout props args)
(markup-list?)
- align
- ((baseline-skip))
+ #:category align
+ #:properties ((baseline-skip))
"
@cindex stacking text in a column
@@ -1240,9 +1220,9 @@ in @var{args}.
(define-builtin-markup-command (dir-column layout props args)
(markup-list?)
- align
- ((direction)
- (baseline-skip))
+ #:category align
+ #:properties ((direction)
+ (baseline-skip))
"
@cindex changing direction of text columns
@@ -1281,8 +1261,8 @@ setting of the @code{direction} layout property.
(define-builtin-markup-command (center-column layout props args)
(markup-list?)
- align
- ((baseline-skip))
+ #:category align
+ #:properties ((baseline-skip))
"
@cindex centering a column of text
@@ -1301,8 +1281,8 @@ Put @code{args} in a centered column.
(define-builtin-markup-command (left-column layout props args)
(markup-list?)
- align
- ((baseline-skip))
+ #:category align
+ #:properties ((baseline-skip))
"
@cindex text columns, left-aligned
@@ -1321,8 +1301,8 @@ Put @code{args} in a left-aligned column.
(define-builtin-markup-command (right-column layout props args)
(markup-list?)
- align
- ((baseline-skip))
+ #:category align
+ #:properties ((baseline-skip))
"
@cindex text columns, right-aligned
@@ -1341,8 +1321,7 @@ Put @code{args} in a right-aligned column.
(define-builtin-markup-command (vcenter layout props arg)
(markup?)
- align
- ()
+ #:category align
"
@cindex vertically centering text
@@ -1361,8 +1340,7 @@ Align @code{arg} to its address@hidden
(define-builtin-markup-command (center-align layout props arg)
(markup?)
- align
- ()
+ #:category align
"
@cindex horizontally centering text
@@ -1383,8 +1361,7 @@ Align @code{arg} to its address@hidden
(define-builtin-markup-command (right-align layout props arg)
(markup?)
- align
- ()
+ #:category align
"
@cindex right aligning text
@@ -1405,8 +1382,7 @@ Align @var{arg} on its right edge.
(define-builtin-markup-command (left-align layout props arg)
(markup?)
- align
- ()
+ #:category align
"
@cindex left aligning text
@@ -1427,8 +1403,7 @@ Align @var{arg} on its left edge.
(define-builtin-markup-command (general-align layout props axis dir arg)
(integer? number? markup?)
- align
- ()
+ #:category align
"
@cindex controlling general text alignment
@@ -1468,8 +1443,7 @@ Align @var{arg} in @var{axis} direction to the @var{dir}
side.
(define-builtin-markup-command (halign layout props dir arg)
(number? markup?)
- align
- ()
+ #:category align
"
@cindex setting horizontal text alignment
@@ -1507,8 +1481,7 @@ alignment accordingly.
(define-builtin-markup-command (with-dimensions layout props x y arg)
(number-pair? number-pair? markup?)
- other
- ()
+ #:category other
"
@cindex setting extent of text objects
@@ -1518,8 +1491,7 @@ Set the dimensions of @var{arg} to @var{x}
address@hidden@var{y}."
(define-builtin-markup-command (pad-around layout props amount arg)
(number? markup?)
- align
- ()
+ #:category align
"Add padding @var{amount} all around @var{arg}.
@lilypond[verbatim,quote]
@@ -1544,8 +1516,7 @@ Set the dimensions of @var{arg} to @var{x}
address@hidden@var{y}."
(define-builtin-markup-command (pad-x layout props amount arg)
(number? markup?)
- align
- ()
+ #:category align
"
@cindex padding text horizontally
@@ -1573,8 +1544,7 @@ Add padding @var{amount} around @var{arg} in the
address@hidden
(define-builtin-markup-command (put-adjacent layout props axis dir arg1 arg2)
(integer? ly:dir? markup? markup?)
- align
- ()
+ #:category align
"Put @var{arg2} next to @var{arg1}, without moving @var{arg1}."
(let ((m1 (interpret-markup layout props arg1))
(m2 (interpret-markup layout props arg2)))
@@ -1582,8 +1552,7 @@ Add padding @var{amount} around @var{arg} in the
address@hidden
(define-builtin-markup-command (transparent layout props arg)
(markup?)
- other
- ()
+ #:category other
"Make @var{arg} transparent.
@lilypond[verbatim,quote]
@@ -1600,8 +1569,7 @@ Add padding @var{amount} around @var{arg} in the
address@hidden
(define-builtin-markup-command (pad-to-box layout props x-ext y-ext arg)
(number-pair? number-pair? markup?)
- align
- ()
+ #:category align
"Make @var{arg} take at least @var{x-ext}, @var{y-ext} space.
@lilypond[verbatim,quote]
@@ -1626,8 +1594,7 @@ Add padding @var{amount} around @var{arg} in the
address@hidden
(define-builtin-markup-command (hcenter-in layout props length arg)
(number? markup?)
- align
- ()
+ #:category align
"Center @var{arg} horizontally within a box of extending
@var{length}/2 to the left and right.
@@ -1662,8 +1629,7 @@ Add padding @var{amount} around @var{arg} in the
address@hidden
(define-builtin-markup-command (fromproperty layout props symbol)
(symbol?)
- other
- ()
+ #:category other
"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.
@@ -1688,8 +1654,7 @@ returns an empty markup.
(define-builtin-markup-command (on-the-fly layout props procedure arg)
(symbol? markup?)
- other
- ()
+ #:category other
"Apply the @var{procedure} markup command to @var{arg}.
@var{procedure} should take a single argument."
(let ((anonymous-with-signature (lambda (layout props arg) (procedure layout
props arg))))
@@ -1700,8 +1665,7 @@ returns an empty markup.
(define-builtin-markup-command (override layout props new-prop arg)
(pair? markup?)
- other
- ()
+ #:category other
"
@cindex overriding properties within text markup
@@ -1735,8 +1699,7 @@ may be any property supported by
@rinternals{font-interface},
(define-builtin-markup-command (verbatim-file layout props name)
(string?)
- other
- ()
+ #:category other
"Read the contents of file @var{name}, and include it verbatim.
@lilypond[verbatim,quote]
@@ -1759,8 +1722,7 @@ may be any property supported by
@rinternals{font-interface},
(define-builtin-markup-command (smaller layout props arg)
(markup?)
- font
- ()
+ #:category font
"Decrease the font size relative to the current setting.
@lilypond[verbatim,quote]
@@ -1781,8 +1743,7 @@ may be any property supported by
@rinternals{font-interface},
(define-builtin-markup-command (larger layout props arg)
(markup?)
- font
- ()
+ #:category font
"Increase the font size relative to the current setting.
@lilypond[verbatim,quote]
@@ -1798,8 +1759,7 @@ may be any property supported by
@rinternals{font-interface},
(define-builtin-markup-command (finger layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set @var{arg} as small numbers.
@lilypond[verbatim,quote]
@@ -1815,8 +1775,7 @@ may be any property supported by
@rinternals{font-interface},
(define-builtin-markup-command (abs-fontsize layout props size arg)
(number? markup?)
- font
- ()
+ #:category font
"Use @var{size} as the absolute font size to display @var{arg}.
Adjusts @code{baseline-skip} and @code{word-space} accordingly.
@@ -1843,10 +1802,10 @@ Adjusts @code{baseline-skip} and @code{word-space}
accordingly.
(define-builtin-markup-command (fontsize layout props increment arg)
(number? markup?)
- font
- ((font-size 0)
- (word-space 1)
- (baseline-skip 2))
+ #:category font
+ #:properties ((font-size 0)
+ (word-space 1)
+ (baseline-skip 2))
"Add @var{increment} to the font-size. Adjusts @code{baseline-skip}
accordingly.
@@ -1866,8 +1825,7 @@ accordingly.
(define-builtin-markup-command (magnify layout props sz arg)
(number? markup?)
- font
- ()
+ #:category font
"
@cindex magnifying text
@@ -1897,8 +1855,7 @@ Use @code{\\fontsize} otherwise.
(define-builtin-markup-command (bold layout props arg)
(markup?)
- font
- ()
+ #:category font
"Switch to bold font-series.
@lilypond[verbatim,quote]
@@ -1913,8 +1870,7 @@ Use @code{\\fontsize} otherwise.
(define-builtin-markup-command (sans layout props arg)
(markup?)
- font
- ()
+ #:category font
"Switch to the sans serif font family.
@lilypond[verbatim,quote]
@@ -1930,8 +1886,7 @@ Use @code{\\fontsize} otherwise.
(define-builtin-markup-command (number layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font family to @code{number}, which yields the font used for
time signatures and fingerings. This font contains numbers and
some punctuation; it has no letters.
@@ -1947,8 +1902,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (roman layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font family to @code{roman}.
@lilypond[verbatim,quote]
@@ -1968,8 +1922,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (huge layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font size to +2.
@lilypond[verbatim,quote]
@@ -1984,8 +1937,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (large layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font size to +1.
@lilypond[verbatim,quote]
@@ -2000,8 +1952,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (normalsize layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font size to default.
@lilypond[verbatim,quote]
@@ -2021,8 +1972,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (small layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font size to -1.
@lilypond[verbatim,quote]
@@ -2037,8 +1987,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (tiny layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font size to -2.
@lilypond[verbatim,quote]
@@ -2053,8 +2002,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (teeny layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set font size to -3.
@lilypond[verbatim,quote]
@@ -2069,8 +2017,7 @@ some punctuation; it has no letters.
(define-builtin-markup-command (fontCaps layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set @code{font-shape} to @code{caps}
Note: @code{\\fontCaps} requires the installation and selection of
@@ -2080,8 +2027,7 @@ fonts which support the @code{caps} font shape."
;; Poor man's caps
(define-builtin-markup-command (smallCaps layout props arg)
(markup?)
- font
- ()
+ #:category font
"Emit @var{arg} as small caps.
Note: @code{\\smallCaps} does not support accented characters.
@@ -2128,8 +2074,7 @@ Note: @code{\\smallCaps} does not support accented
characters.
(define-builtin-markup-command (caps layout props arg)
(markup?)
- font
- ()
+ #:category font
"Copy of the @code{\\smallCaps} command.
@lilypond[verbatim,quote]
@@ -2145,8 +2090,7 @@ Note: @code{\\smallCaps} does not support accented
characters.
(define-builtin-markup-command (dynamic layout props arg)
(markup?)
- font
- ()
+ #:category font
"Use the dynamic font. This font only contains @b{s}, @b{f}, @b{m},
@b{z}, @b{p}, and @b{r}. When producing phrases, like
@address@hidden@address@hidden, the normal words (like @address@hidden) should
be
@@ -2163,8 +2107,7 @@ done in a different font. The recommended font for this
is bold and italic.
(define-builtin-markup-command (text layout props arg)
(markup?)
- font
- ()
+ #:category font
"Use a text font instead of music symbol or music alphabet font.
@lilypond[verbatim,quote]
@@ -2185,8 +2128,7 @@ done in a different font. The recommended font for this
is bold and italic.
(define-builtin-markup-command (italic layout props arg)
(markup?)
- font
- ()
+ #:category font
"Use italic @code{font-shape} for @var{arg}.
@lilypond[verbatim,quote]
@@ -2201,8 +2143,7 @@ done in a different font. The recommended font for this
is bold and italic.
(define-builtin-markup-command (typewriter layout props arg)
(markup?)
- font
- ()
+ #:category font
"Use @code{font-family} typewriter for @var{arg}.
@lilypond[verbatim,quote]
@@ -2218,8 +2159,7 @@ done in a different font. The recommended font for this
is bold and italic.
(define-builtin-markup-command (upright layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set @code{font-shape} to @code{upright}. This is the opposite
of @code{italic}.
@@ -2241,8 +2181,7 @@ of @code{italic}.
(define-builtin-markup-command (medium layout props arg)
(markup?)
- font
- ()
+ #:category font
"Switch to medium font-series (in contrast to bold).
@lilypond[verbatim,quote]
@@ -2263,8 +2202,7 @@ of @code{italic}.
(define-builtin-markup-command (normal-text layout props arg)
(markup?)
- font
- ()
+ #:category font
"Set all font related properties (except the size) to get the default
normal text font, no matter what font was used earlier.
@@ -2294,8 +2232,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (doublesharp layout props)
()
- music
- ()
+ #:category music
"Draw a double sharp symbol.
@lilypond[verbatim,quote]
@@ -2307,8 +2244,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (sesquisharp layout props)
()
- music
- ()
+ #:category music
"Draw a 3/2 sharp symbol.
@lilypond[verbatim,quote]
@@ -2320,8 +2256,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (sharp layout props)
()
- music
- ()
+ #:category music
"Draw a sharp symbol.
@lilypond[verbatim,quote]
@@ -2333,8 +2268,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (semisharp layout props)
()
- music
- ()
+ #:category music
"Draw a semisharp symbol.
@lilypond[verbatim,quote]
@@ -2346,8 +2280,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (natural layout props)
()
- music
- ()
+ #:category music
"Draw a natural symbol.
@lilypond[verbatim,quote]
@@ -2359,8 +2292,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (semiflat layout props)
()
- music
- ()
+ #:category music
"Draw a semiflat symbol.
@lilypond[verbatim,quote]
@@ -2372,8 +2304,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (flat layout props)
()
- music
- ()
+ #:category music
"Draw a flat symbol.
@lilypond[verbatim,quote]
@@ -2385,8 +2316,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (sesquiflat layout props)
()
- music
- ()
+ #:category music
"Draw a 3/2 flat symbol.
@lilypond[verbatim,quote]
@@ -2398,8 +2328,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (doubleflat layout props)
()
- music
- ()
+ #:category music
"Draw a double flat symbol.
@lilypond[verbatim,quote]
@@ -2411,8 +2340,7 @@ normal text font, no matter what font was used earlier.
(define-builtin-markup-command (with-color layout props color arg)
(color? markup?)
- other
- ()
+ #:category other
"
@cindex coloring text
@@ -2441,8 +2369,7 @@ Draw @var{arg} in color specified by @var{color}.
(define-builtin-markup-command (arrow-head layout props axis dir filled)
(integer? ly:dir? boolean?)
- graphic
- ()
+ #:category graphic
"Produce an arrow head in specified direction and axis.
Use the filled head if @var{filled} is specified.
@lilypond[verbatim,quote]
@@ -2472,8 +2399,7 @@ Use the filled head if @var{filled} is specified.
(define-builtin-markup-command (musicglyph layout props glyph-name)
(string?)
- music
- ()
+ #:category music
"@var{glyph-name} is converted to a musical symbol; for example,
@code{\\musicglyph #\"accidentals.natural\"} selects the natural sign from
the music font. See @ruser{The Feta font} for a complete listing of
@@ -2500,8 +2426,7 @@ the possible glyphs.
(define-builtin-markup-command (lookup layout props glyph-name)
(string?)
- other
- ()
+ #:category other
"Lookup a glyph by name.
@lilypond[verbatim,quote]
@@ -2519,8 +2444,7 @@ the possible glyphs.
(define-builtin-markup-command (char layout props num)
(integer?)
- other
- ()
+ #:category other
"Produce a single character. Characters encoded in hexadecimal
format require the prefix @code{#x}.
@@ -2555,8 +2479,7 @@ format require the prefix @code{#x}.
(define-builtin-markup-command (markletter layout props num)
(integer?)
- other
- ()
+ #:category other
"Make a markup letter for @var{num}. The letters start with A address@hidden
(skipping address@hidden), and continue with double letters.
@@ -2572,8 +2495,7 @@ format require the prefix @code{#x}.
(define-builtin-markup-command (markalphabet layout props num)
(integer?)
- other
- ()
+ #:category other
"Make a markup letter for @var{num}. The letters start with A
address@hidden
and continue with double letters.
@@ -2650,9 +2572,9 @@ and continue with double letters.
(define-builtin-markup-command (slashed-digit layout props num)
(integer?)
- other
- ((font-size 0)
- (thickness 1.6))
+ #:category other
+ #:properties ((font-size 0)
+ (thickness 1.6))
"
@cindex slashed digits
@@ -2670,9 +2592,9 @@ figured bass notation.
(define-builtin-markup-command (backslashed-digit layout props num)
(integer?)
- other
- ((font-size 0)
- (thickness 1.6))
+ #:category other
+ #:properties ((font-size 0)
+ (thickness 1.6))
"
@cindex backslashed digits
@@ -2709,7 +2631,9 @@ figured bass notation.
3.42 2.26 3.80 2.40 3.65 1.70 curveto
stroke")
-(define-builtin-markup-command (eyeglasses layout props) () other ()
+(define-builtin-markup-command (eyeglasses layout props)
+ ()
+ #:category other
"Prints out eyeglasses, indicating strongly to look at the conductor.
@lilypond[verbatim,quote]
\\markup { \\eyeglasses }
@@ -2720,8 +2644,7 @@ figured bass notation.
(define-builtin-markup-command (left-brace layout props size)
(number?)
- other
- ()
+ #:category other
"
A feta brace in point size @var{size}.
@@ -2762,8 +2685,7 @@ A feta brace in point size @var{size}.
(define-builtin-markup-command (right-brace layout props size)
(number?)
- other
- ()
+ #:category other
"
A feta brace in point size @var{size}, rotated 180 degrees.
@@ -2784,9 +2706,9 @@ A feta brace in point size @var{size}, rotated 180
degrees.
(define-builtin-markup-command (note-by-number layout props log dot-count dir)
(number? number? number?)
- music
- ((font-size 0)
- (style '()))
+ #:category music
+ #:properties ((font-size 0)
+ (style '()))
"
@cindex notes within text by log and dot-count
@@ -2894,8 +2816,8 @@ Construct a note symbol, with stem. By using fractional
values for
(define-builtin-markup-command (note layout props duration dir)
(string? number?)
- music
- (note-by-number-markup)
+ #:category music
+ #:properties (note-by-number-markup)
"
@cindex notes within text by string
@@ -2922,8 +2844,7 @@ a shortened down stem.
(define-builtin-markup-command (lower layout props amount arg)
(number? markup?)
- align
- ()
+ #:category align
"
@cindex lowering text
@@ -2943,8 +2864,8 @@ A negative @var{amount} indicates raising; see also
@code{\\raise}.
(define-builtin-markup-command (translate-scaled layout props offset arg)
(number-pair? markup?)
- align
- ((font-size 0))
+ #:category align
+ #:properties ((font-size 0))
"
@cindex translating text
@cindex scaling text
@@ -2969,8 +2890,7 @@ Translate @var{arg} by @var{offset}, scaling the offset
by the
(define-builtin-markup-command (raise layout props amount arg)
(number? markup?)
- align
- ()
+ #:category align
"
@cindex raising text
@@ -3000,8 +2920,8 @@ and/or @code{extra-offset} properties.
(define-builtin-markup-command (fraction layout props arg1 arg2)
(markup? markup?)
- other
- ((font-size 0))
+ #:category other
+ #:properties ((font-size 0))
"
@cindex creating text fractions
@@ -3036,8 +2956,8 @@ Make a fraction of two markups.
(define-builtin-markup-command (normal-size-super layout props arg)
(markup?)
- font
- ((baseline-skip))
+ #:category font
+ #:properties ((baseline-skip))
"
@cindex setting superscript in standard font size
@@ -3057,9 +2977,9 @@ Set @var{arg} in superscript with a normal font size.
(define-builtin-markup-command (super layout props arg)
(markup?)
- font
- ((font-size 0)
- (baseline-skip))
+ #:category font
+ #:properties ((font-size 0)
+ (baseline-skip))
"
@cindex superscript text
@@ -3085,8 +3005,7 @@ Set @var{arg} in superscript.
(define-builtin-markup-command (translate layout props offset arg)
(number-pair? markup?)
- align
- ()
+ #:category align
"
@cindex translating text
@@ -3105,9 +3024,9 @@ is a pair of numbers representing the displacement in the
X and Y axis.
(define-builtin-markup-command (sub layout props arg)
(markup?)
- font
- ((font-size 0)
- (baseline-skip))
+ #:category font
+ #:properties ((font-size 0)
+ (baseline-skip))
"
@cindex subscript text
@@ -3134,8 +3053,8 @@ Set @var{arg} in subscript.
(define-builtin-markup-command (normal-size-sub layout props arg)
(markup?)
- font
- ((baseline-skip))
+ #:category font
+ #:properties ((baseline-skip))
"
@cindex setting subscript in standard font size
@@ -3160,8 +3079,7 @@ Set @var{arg} in subscript with a normal font size.
(define-builtin-markup-command (hbracket layout props arg)
(markup?)
- graphic
- ()
+ #:category graphic
"
@cindex placing horizontal brackets around text
@@ -3182,8 +3100,7 @@ Draw horizontal brackets around @var{arg}.
(define-builtin-markup-command (bracket layout props arg)
(markup?)
- graphic
- ()
+ #:category graphic
"
@cindex placing vertical brackets around text
@@ -3206,8 +3123,7 @@ Draw vertical brackets around @var{arg}.
(define-builtin-markup-command (page-ref layout props label gauge default)
(symbol? markup? markup?)
- other
- ()
+ #:category other
"
@cindex referencing page numbers in text
@@ -3261,8 +3177,8 @@ when @var{label} is not found."
(define-builtin-markup-list-command (justified-lines layout props args)
(markup-list?)
- ((baseline-skip)
- wordwrap-internal-markup-list)
+ #:properties ((baseline-skip)
+ wordwrap-internal-markup-list)
"
@cindex justifying lines of text
@@ -3275,8 +3191,8 @@ Use @code{\\override-lines #'(line-width . @var{X})} to
set the line width;
(define-builtin-markup-list-command (wordwrap-lines layout props args)
(markup-list?)
- ((baseline-skip)
- wordwrap-internal-markup-list)
+ #:properties ((baseline-skip)
+ wordwrap-internal-markup-list)
"Like @code{\\wordwrap}, but return a list of lines instead of a single
markup.
Use @code{\\override-lines #'(line-width . @var{X})} to set the line width,
where @var{X} is the number of staff spaces."
@@ -3286,7 +3202,7 @@ where @var{X} is the number of staff spaces."
(define-builtin-markup-list-command (column-lines layout props args)
(markup-list?)
- ((baseline-skip))
+ #:properties ((baseline-skip))
"Like @code{\\column}, but return a list of lines instead of a single markup.
@code{baseline-skip} determines the space between each markup in @var{args}."
(space-lines baseline-skip
@@ -3294,6 +3210,5 @@ where @var{X} is the number of staff spaces."
(define-builtin-markup-list-command (override-lines layout props new-prop args)
(pair? markup-list?)
- ()
"Like @code{\\override}, for markup lists."
(interpret-markup-list layout (cons (list new-prop) props) args))
diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index b74bbc1..7206d8a 100644
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -919,11 +919,11 @@ a fret-indication list with the appropriate values"
(define-builtin-markup-command
(fret-diagram-verbose layout props marking-list)
(pair?) ; argument type (list, but use pair? for speed)
- instrument-specific-markup ; markup type
- ((align-dir -0.4) ; properties and defaults
- (size 1.0)
- (fret-diagram-details)
- (thickness 0.5))
+ #:category instrument-specific-markup ; markup type
+ #:properties ((align-dir -0.4) ; properties and defaults
+ (size 1.0)
+ (fret-diagram-details)
+ (thickness 0.5))
"Make a fret diagram containing the symbols indicated in @var{marking-list}.
For example,
@@ -971,8 +971,8 @@ indications per string.
(define-builtin-markup-command (fret-diagram layout props definition-string)
(string?) ; argument type
- instrument-specific-markup ; markup category
- (fret-diagram-verbose-markup) ; properties and defaults
+ #:category instrument-specific-markup ; markup category
+ #:properties (fret-diagram-verbose-markup) ; properties and defaults
"Make a (guitar) fret diagram. For example, say
@example
@@ -1049,8 +1049,8 @@ Note: There is no limit to the number of fret indications
per string.
(define-builtin-markup-command
(fret-diagram-terse layout props definition-string)
(string?) ; argument type
- instrument-specific-markup ; markup category
- (fret-diagram-verbose-markup) ; properties
+ #:category instrument-specific-markup ; markup category
+ #:properties (fret-diagram-verbose-markup) ; properties
"Make a fret diagram markup using terse string-based syntax.
Here is an example
diff --git a/scm/harp-pedals.scm b/scm/harp-pedals.scm
index 7af4e71..0ff4727 100644
--- a/scm/harp-pedals.scm
+++ b/scm/harp-pedals.scm
@@ -7,10 +7,10 @@
(define-builtin-markup-command (harp-pedal layout props definition-string)
(string?)
- instrument-specific-markup ; markup type for the documentation!
- ((size 1.2)
- (harp-pedal-details '())
- (thickness 0.5))
+ #:category instrument-specific-markup ; markup type for the documentation!
+ #:properties ((size 1.2)
+ (harp-pedal-details '())
+ (thickness 0.5))
"Make a harp pedal diagram.
Possible elements in @var{definition-string}:
diff --git a/scm/tablature.scm b/scm/tablature.scm
index ec26113..d309a95 100644
--- a/scm/tablature.scm
+++ b/scm/tablature.scm
@@ -60,8 +60,7 @@
(define-builtin-markup-command (customTabClef
layout props num-strings staff-space)
(integer? number?)
- music
- ()
+ #:category music
"Draw a tab clef sans-serif style."
(define (square x) (* x x))
(let* ((scale-factor (/ staff-space 1.5))
--
1.6.5.3.153.g0670
- [PATCH 1/4] scm/define-markup-commands.scm: remove some unnecessary lookups, David Kastrup, 2009/11/22
- [PATCH 2/4] scm/harp-pedals.scm: Fold make-harp-pedal into \harp-pedal markup., David Kastrup, 2009/11/22
- [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, David Kastrup, 2009/11/22
- [PATCH 4/4] Use new definitions of define-builtin-markup{, -list}-command,
David Kastrup <=
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, Nicolas Sceaux, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, David Kastrup, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, Nicolas Sceaux, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, David Kastrup, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, Kieren MacMillan, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, David Kastrup, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, Werner LEMBERG, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, David Kastrup, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, Han-Wen Nienhuys, 2009/11/23
- Re: [PATCH 3/4] Make define-builtin-markup{, -list}-command #:category #:properties keywords, David Kastrup, 2009/11/23