David,

On 10 November 2013 10:29, David Kastrup <[email protected]> wrote:

> James <[email protected]> writes:
>
> > I'll make a patch.
> >
> > I'm not sure how the process will work (from my own point of view anyway)
> > as Patchy only tests against master and we've split of 2.18, so I'll do
> the
> > make and make check/doc manually if that is OK?
> >
> > Assuming it is all OK, and goes through the countdown, do I just 'git
> push
> > HEAD:stable/2.18'?
>
> No, stable/2.18 is my turf.  You just go through the standard process in
> relation to master.  If you don't want to actually push to master, you
> can send me a git format-patch version against master (or stable/2.18 if
> you want to rebase there yourself) and I'll take it from there.
>
> If that's too complex, just stay relative to master and push to staging.
> Once it went through cleanly, I'll cherry-pick from master into
> stable/2.18 (fixing the merge conflict) and revert in staging
> afterwards.
>
> 2.18-only changes are a bit of a nuisance to deal with, but fortunately
> there are not all that many of them.
>
> --
> David Kastrup
>

Here's the patch. I ran make and make doc against stable/2.18 and had no
complaints

If you want a tracker/rietveld let me know I can do all that as well.

James
From 1738d10f7cc161d542fd19657041ac627b34f078 Mon Sep 17 00:00:00 2001
From: James Lowe <[email protected]>
Date: Sun, 10 Nov 2013 10:55:15 +0000
Subject: [PATCH] Mention new NullVoice feature including a simple example

---
 Documentation/changes.tely |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 909d8e6..67caf1a 100644
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -62,6 +62,27 @@ which scares away people.
 @end ignore
 
 @item
+There is now a new context called @code{NullVoice} which, while not
+appearing in the printed output, can be used to align lyrics.  It may
+also be used with the @code{partcombine} function.
+
+@lilypond[verbatim,quote]
+soprano = \relative c' { c e g c }
+alto = \relative c' { a c e g }
+verse = \lyricmode { This is my song }
+
+\score {
+  \new Staff <<
+    \partcombine \soprano \alto
+    \new NullVoice = "aligner" \soprano
+    \new Lyrics \lyricsto "aligner" \verse
+  >>
+  \layout {}
+}
+@end lilypond
+
+
+@item
 Several articulations can be put into a single variable or
 returned from an event function:
 
-- 
1.7.0.4

_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to