From f3f38d0c2a26a32c6df4c918db58783380b371ca Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 16 Aug 2011 10:19:47 +0200 Subject: [PATCH] [notation reference] PDF layout fixes and other minor improvements. --- Documentation/included/note-head-style.ly | 25 +++++++----- Documentation/included/simple.ly | 3 +- scm/define-markup-commands.scm | 50 +++++++++++++---------- scm/display-woodwind-diagrams.scm | 3 +- 4 files changed, 46 insertions(+), 35 deletions(-) diff --git a/Documentation/included/note-head-style.ly b/Documentation/included/note-head-style.ly index 471b79d9ee..c649068ec6 100644 --- a/Documentation/included/note-head-style.ly +++ b/Documentation/included/note-head-style.ly @@ -1,29 +1,35 @@ \version "2.14.0" -\header{ + +\header { texidoc=" -Note head shapes may be set from several choices. -The stem endings should be adjusted according to the note head. +Note head shapes may be set from several choices. +The stem endings should be adjusted according to the note head. If you want different note head styles on one stem, you must create a special context. Harmonic notes have a different shape and different -dimensions. +dimensions. " } \layout { indent = 0.0 ragged-right = ##t + + \context { + \Score + \remove "Bar_number_engraver" + } } pattern = << \new Voice { - \override Stem #'direction = #UP - e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4 + \override Stem #'direction = #UP + e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4 \bar "||" } \new Voice { - \override Stem #'direction = #DOWN - a4 a2. a1 a\breve*1/2 a\longa*1/4 + \override Stem #'direction = #DOWN + a4 a2. a1 a\breve*1/2 a\longa*1/4 \bar "||" } >> @@ -99,6 +105,3 @@ pattern = << s1*0^\markup { "slash" } \pattern } - - - diff --git a/Documentation/included/simple.ly b/Documentation/included/simple.ly index a2390859cc..790559a8f0 100644 --- a/Documentation/included/simple.ly +++ b/Documentation/included/simple.ly @@ -3,5 +3,6 @@ c d e f g a b c } -%% Optional helper for automatic updating by convert-ly. May be omitted. +%% Optional helper for automatic updating by convert-ly. +%% May be omitted. \version "2.14.0" diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 95658c16a6..cb1e233de9 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -60,7 +60,7 @@ ;;; functions that take a markup as their last argument. ;;; ;;; args-signature -;;; the arguments signature, i.e. a list of type predicates which +;;; the arguments signature, i.e., a list of type predicates which ;;; are used to type check the arguments, and also to define the general ;;; argument types (markup, markup-list, scheme) that the command is ;;; expecting. @@ -69,19 +69,19 @@ ;;; ;;; category ;;; for documentation purpose, builtin markup commands are grouped by -;;; category. This can be any symbol. When documentation is generated, +;;; category. This can be any symbol. When documentation is generated, ;;; the symbol is converted to a capitalized string, where hyphens are ;;; replaced by spaces. ;;; ;;; property-bindings ;;; this is used both for documentation generation, and to ease -;;; programming the command itself. It is list of +;;; programming the command itself. It is list of ;;; (property-name default-value) ;;; or (property-name) -;;; elements. Each property is looked-up in the `props' argument, and +;;; elements. Each property is looked-up in the `props' argument, and ;;; the symbol naming the property is bound to its value. ;;; When the property is not found in `props', then the symbol is bound -;;; to the given default value. When no default value is given, #f is +;;; to the given default value. When no default value is given, #f is ;;; used instead. ;;; Thus, using the following property bindings: ;;; ((thickness 0.1) @@ -92,15 +92,15 @@ ;;; ..body..) ;;; When a command `B' internally calls an other command `A', it may ;;; desirable to see in `B' documentation all the properties and -;;; default values used by `A'. In that case, add `A-markup' to the -;;; property-bindings of B. (This is used when generating +;;; default values used by `A'. In that case, add `A-markup' to the +;;; property-bindings of B. (This is used when generating ;;; documentation, but won't create bindings.) ;;; ;;; documentation-string ;;; the command documentation string (used to generate manuals) ;;; ;;; body -;;; the command body. The function is supposed to return a stencil. +;;; the command body. The function is supposed to return a stencil. ;;; ;;; Each markup command definition shall have a documentation string ;;; with description, syntax and example. @@ -270,8 +270,8 @@ the PDF backend. " @cindex referencing page numbers in text -Add a link to the page @var{page-number} around @var{arg}. This only works in -the PDF backend. +Add a link to the page @var{page-number} around @var{arg}. This only works +in the PDF backend. @lilypond[verbatim,quote] \\markup { @@ -292,12 +292,14 @@ the PDF backend. " @cindex referencing page labels in text -Add a link to the page holding label @var{label} around @var{arg}. This +Add a link to the page holding label @var{label} around @var{arg}. This only works in the PDF backend. @lilypond[verbatim,quote] \\markup { - \\with-link #\"label\" { \\italic { This links to the page containing the label... } } + \\with-link #\"label\" { + \\italic { This links to the page containing the label... } + } } @end lilypond" (let* ((arg-stencil (interpret-markup layout props arg)) @@ -860,13 +862,15 @@ Inline an image of music. indent = 0.0\\cm \\context { \\Score - \\override RehearsalMark #'break-align-symbols = - #'(time-signature key-signature) - \\override RehearsalMark #'self-alignment-X = #LEFT + \\override RehearsalMark + #'break-align-symbols = #'(time-signature key-signature) + \\override RehearsalMark + #'self-alignment-X = #LEFT } \\context { \\Staff - \\override TimeSignature #'break-align-anchor-alignment = #LEFT + \\override TimeSignature + #'break-align-anchor-alignment = #LEFT } } } @@ -2515,13 +2519,13 @@ normal text font, no matter what font was used earlier. @lilypond[verbatim,quote] \\markup { \\huge \\bold \\sans \\caps { - Some text with font overrides + huge bold sans caps \\hspace #2 \\normal-text { - Default text, same font-size + huge normal } \\hspace #2 - More text as before + as before } } @end lilypond" @@ -3500,7 +3504,7 @@ a column containing several lines of text. " @cindex referencing page numbers in text -Reference to a page number. @var{label} is the label set on the referenced +Reference to a page number. @var{label} is the label set on the referenced page (using the @code{\\label} command), @var{gauge} a markup used to estimate the maximum width of the page number, and @var{default} the value to display when @var{label} is not found." @@ -3611,8 +3615,10 @@ Patterns are aligned to the @var{dir} markup. \\fill-with-pattern #1.5 #CENTER - left right \\null \"left-aligned :\" - \\override #'(line-width . 50) \\fill-with-pattern #2 #LEFT : left first - \\override #'(line-width . 50) \\fill-with-pattern #2 #LEFT : left second + \\override #'(line-width . 50) + \\fill-with-pattern #2 #LEFT : left first + \\override #'(line-width . 50) + \\fill-with-pattern #2 #LEFT : left second } @end lilypond" (let* ((pattern-x-extent (ly:stencil-extent (interpret-markup layout props pattern) X)) diff --git a/scm/display-woodwind-diagrams.scm b/scm/display-woodwind-diagrams.scm index a2b037e294..642e37a34f 100644 --- a/scm/display-woodwind-diagrams.scm +++ b/scm/display-woodwind-diagrams.scm @@ -1872,7 +1872,8 @@ "Make a woodwind-instrument diagram. For example, say @example -\\markup \\woodwind-diagram #'oboe #'((lh . (d ees)) (cc . (five3qT1q)) (rh . (gis))) +\\markup \\woodwind-diagram + #'oboe #'((lh . (d ees)) (cc . (five3qT1q)) (rh . (gis))) @end example @noindent -- 2.39.2