From ec09bc9bd0802b6f55ae19b6dae4bd5d4b997365 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Tue, 9 Aug 2005 02:39:25 +0000 Subject: [PATCH] Documentation/user/programming-interface.itely: fix @{ @}. scm/define-markup-commands.scm: add linewidth info to \justify and \wordwrap. Documentation/user/advanced-notation.itely: shaped->shape lily/note-heads-engraver.cc: changed Shaped->Shape in a comment. No actual code was touched. Documentation/user/invoking.itely: add more info about \include. Thanks, Bruce! --- ChangeLog | 10 +++++++ Documentation/user/advanced-notation.itely | 12 ++++----- Documentation/user/invoking.itely | 31 +++++++++++++++++++--- THANKS | 6 ++--- lily/note-heads-engraver.cc | 2 +- scm/define-markup-commands.scm | 4 +-- 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6139de8300..fe5691b206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,16 @@ * scm/define-markup-commands.scm: add linewidth info to \justify and \wordwrap. + * Documentation/user/advanced-notation.itely: shaped->shape + + * lily/note-heads-engraver.cc: changed Shaped->Shape in a + comment. No actual code was touched. + + * Documentation/user/invoking.itely: add more info about + \include. Thanks, Bruce! + + * THANKS: add Bruce Fairchild, alphabetise. + 2005-08-08 Mats Bengtsson * Documentation/user/programming-interface.itely (Markup diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely index 4a840dd44d..b842e2f465 100644 --- a/Documentation/user/advanced-notation.itely +++ b/Documentation/user/advanced-notation.itely @@ -1836,7 +1836,7 @@ teaching tools in addition to great musical scores. * Balloon help:: * Blank music sheet:: * Hidden notes:: -* Shaped note heads :: +* Shape note heads :: * Easy Notation note heads:: * Analysis brackets:: * Coloring objects:: @@ -1938,14 +1938,14 @@ as possible. @end lilypond -@node Shaped note heads -@subsection Shaped note heads +@node Shape note heads +@subsection Shape note heads -In shaped note head notation, the shape of the note head corresponds +In shape note head notation, the shape of the note head corresponds to the harmonic function of a note in the scale. This notation was popular in the 19th century American song books. -Shaped note heads can be produced by setting @code{\aikenHeads} or +Shape note heads can be produced by setting @code{\aikenHeads} or @code{\sacredHarpHeads}, depending on the style desired. @lilypond[verbatim,relative=1,fragment] @@ -1963,7 +1963,7 @@ scale is determined by the @code{\key} command @findex \aikenHeads @findex \sacredHarpHeads -Shaped note heads are implemented through the @code{shapeNoteStyles} +Shape note heads are implemented through the @code{shapeNoteStyles} property. Its value is a vector of symbols. The k-th element indicates the style to use for the k-th step of the scale. Arbitrary combinations are possible, eg., diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely index eec9ce8623..b9c1dfcd37 100644 --- a/Documentation/user/invoking.itely +++ b/Documentation/user/invoking.itely @@ -733,7 +733,32 @@ file, use \include "otherfile.ly" @end example -For example, you may write separate files for each instrument part and -create a ``full score'' file which brings together the individual -instrument files. +The line @code{\include "file.ly"} is equivalent to pasting the contents +of file.ly into the current file at the place where you have the +\include. For example, for a large project you might write separate files +for each instrument part and create a ``full score'' file which brings +together the individual instrument files. + +The initialization of LilyPond is done in a number of files that are +included by default when you start the program, normally transparent to the +user. Run lilypond --verbose to see a list of paths and files that Lily +finds. + +Files placed in directory @file{PATH/TO/share/lilypond/VERSION/ly/} (where +VERSION is in the form ``2.6.1'') are on the path and available to +@code{\include}. Files in the +current working directory are available to \include, but a file of the same +name in LilyPond's installation takes precedence. Files are +available to \include from directories in the search path specified as an +option when invoking @code{lilypond --include=DIR} which adds DIR to the search +path. + +The @code{\include} statement can use full path information, but with the Unix +convention @code{"/"} rather than the DOS/Windows @code{"\"}. For example, +if @file{stuff.ly} is located one directory higher than the current working +directory, use + +@example +\include "../stuff.ly" +@end example diff --git a/THANKS b/THANKS index 62452ed903..d7399bd2c5 100644 --- a/THANKS +++ b/THANKS @@ -12,10 +12,11 @@ Graham Percival - Documentation Editor CONTRIBUTORS +Bruce Fairchild Heikki Junes Joe Neeman -Yoshinobu Ishizaki Sven Axelsson +Yoshinobu Ishizaki SPONSORS @@ -29,9 +30,9 @@ Trevor Baca BUG HUNTERS/SUGGESTIONS -Erlend Aasland Bob Broadus Donald Axel +Erlend Aasland Release 2.6 @@ -107,7 +108,6 @@ David Bobroff Bernard Hurley Bruce Fairchild Bruce McIntyre -Bruce Fairchild Daniel Johnson David Rogers Dylan Nicholson diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 0bff1e7d11..2827d69ce9 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -95,7 +95,7 @@ Note_heads_engraver::process_music () note->set_property ("staff-position", scm_from_int (pos)); /* - Shaped note heads change on step of the scale. + Shape note heads change on step of the scale. */ SCM shape_vector = get_property ("shapeNoteStyles"); if (scm_is_vector (shape_vector)) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index b30fb65d0d..17d6be097d 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -467,13 +467,13 @@ determines the space between each markup in @var{args}." (def-markup-command (justify layout props args) (markup-list?) "Like wordwrap, but with lines stretched to justify the margins. -Use @code{\override #'(linewidth . X)} to set linewidth, where X +Use @code{\\override #'(linewidth . X)} to set linewidth, where X is the number of staff spaces." (wordwrap-markups layout props args #t)) (def-markup-command (wordwrap layout props args) (markup-list?) - "Simple wordwrap. Use @code{\override #'(linewidth . X)} to set + "Simple wordwrap. Use @code{\\override #'(linewidth . X)} to set linewidth, where X is the number of staff spaces." (wordwrap-markups layout props args #f)) -- 2.39.2