CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Graham Percival <[EMAIL PROTECTED]> 05/08/09 02:39:25
Modified files:
. : ChangeLog THANKS
Documentation/user: advanced-notation.itely invoking.itely
lily : note-heads-engraver.cc
scm : define-markup-commands.scm
Log message:
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!
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3981&tr2=1.3982&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.139&tr2=1.140&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/advanced-notation.itely.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/invoking.itely.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-heads-engraver.cc.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3981 lilypond/ChangeLog:1.3982
--- lilypond/ChangeLog:1.3981 Mon Aug 8 22:47:23 2005
+++ lilypond/ChangeLog Tue Aug 9 02:39:24 2005
@@ -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 <[EMAIL PROTECTED]>
* Documentation/user/programming-interface.itely (Markup
Index: lilypond/Documentation/user/advanced-notation.itely
diff -u lilypond/Documentation/user/advanced-notation.itely:1.44
lilypond/Documentation/user/advanced-notation.itely:1.45
--- lilypond/Documentation/user/advanced-notation.itely:1.44 Mon Aug 1
11:31:09 2005
+++ lilypond/Documentation/user/advanced-notation.itely Tue Aug 9 02:39:25 2005
@@ -1836,7 +1836,7 @@
* 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 @@
@end lilypond
[EMAIL PROTECTED] Shaped note heads
[EMAIL PROTECTED] Shaped note heads
[EMAIL PROTECTED] Shape note heads
[EMAIL PROTECTED] 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 @@
@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.,
Index: lilypond/Documentation/user/invoking.itely
diff -u lilypond/Documentation/user/invoking.itely:1.39
lilypond/Documentation/user/invoking.itely:1.40
--- lilypond/Documentation/user/invoking.itely:1.39 Fri Jul 29 00:19:59 2005
+++ lilypond/Documentation/user/invoking.itely Tue Aug 9 02:39:25 2005
@@ -733,7 +733,32 @@
\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
[EMAIL PROTECTED] 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
+
[EMAIL PROTECTED]
+\include "../stuff.ly"
[EMAIL PROTECTED] example
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.139 lilypond/THANKS:1.140
--- lilypond/THANKS:1.139 Thu Aug 4 10:46:34 2005
+++ lilypond/THANKS Tue Aug 9 02:39:25 2005
@@ -12,10 +12,11 @@
CONTRIBUTORS
+Bruce Fairchild
Heikki Junes
Joe Neeman
-Yoshinobu Ishizaki
Sven Axelsson
+Yoshinobu Ishizaki
SPONSORS
@@ -29,9 +30,9 @@
BUG HUNTERS/SUGGESTIONS
-Erlend Aasland
Bob Broadus
Donald Axel
+Erlend Aasland
Release 2.6
@@ -107,7 +108,6 @@
Bernard Hurley
Bruce Fairchild
Bruce McIntyre
-Bruce Fairchild
Daniel Johnson
David Rogers
Dylan Nicholson
Index: lilypond/lily/note-heads-engraver.cc
diff -u lilypond/lily/note-heads-engraver.cc:1.106
lilypond/lily/note-heads-engraver.cc:1.107
--- lilypond/lily/note-heads-engraver.cc:1.106 Sun Jul 24 19:31:02 2005
+++ lilypond/lily/note-heads-engraver.cc Tue Aug 9 02:39:25 2005
@@ -95,7 +95,7 @@
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))
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.106
lilypond/scm/define-markup-commands.scm:1.107
--- lilypond/scm/define-markup-commands.scm:1.106 Mon Aug 8 22:47:23 2005
+++ lilypond/scm/define-markup-commands.scm Tue Aug 9 02:39:25 2005
@@ -467,13 +467,13 @@
(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))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
