Re: 2.16.1

[David Kastrup]

David Kastrup <address@hidden> writes:

> If it is ok with people, I'd propose the following course in order to
> get the ball rolling again:
>
> I'll merge stable/2.16 into translation.  That should be unproblematic.
> Then I'll merge translation into staging.  This will require a bit of
> cleanup and conflict resolution.

Ok, I got the merge here done.  The only changes outside of
Documentation/xx strictly are now in

#       modified:   
Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly
#       modified:   po/eo.po
#       modified:   po/es.po
#       modified:   po/it.po

The first has \consists "something" instead of \consists something and
is definitely correct.  The history shows the following, making it
likely that this change might get backed out again by automatisms:

* commit 4ed5d7710416aff0a9e68f0d751b4e15c30fdf92
| Author: Phil Holmes <address@hidden>
| Date:   Sun Sep 30 11:02:50 2012 +0100
| 
|     MakeLSR run with LSR tarball
| 
| diff --git a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-an
| index 80a56e2..8abdbaa 100644
| --- a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below
| +++ b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below
| @@ -30,7 +30,7 @@ independently of the other.
|      \new Staff {
|        <<
|          \new Voice \with {
| -          \consists "Mark_engraver"
| +          \consists Mark_engraver
|            \consists "Staff_collecting_engraver"
|          }
|          { c4 d e f
| @@ -38,7 +38,7 @@ independently of the other.
|            c4 d e f
|          }
|          \new Voice \with {
| -          \consists "Mark_engraver"
| +          \consists Mark_engraver
|            \consists "Staff_collecting_engraver"
|            \override RehearsalMark #'direction = #DOWN
|          }
|  
* commit 0a12e59b93bceea2c94c61e5c35b17cd88fb6d8f
| Author: David Kastrup <address@hidden>
| Date:   Mon Aug 20 10:06:44 2012 +0200
| 
|     Issue 2760: CG wants all engravers to have double-quotes around them
| 
| diff --git a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-an
| index 8abdbaa..80a56e2 100644
| --- a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below
| +++ b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below
| @@ -30,7 +30,7 @@ independently of the other.
|      \new Staff {
|        <<
|          \new Voice \with {
| -          \consists Mark_engraver
| +          \consists "Mark_engraver"
|            \consists "Staff_collecting_engraver"
|          }
|          { c4 d e f
| @@ -38,7 +38,7 @@ independently of the other.
|            c4 d e f
|          }
|          \new Voice \with {
| -          \consists Mark_engraver
| +          \consists "Mark_engraver"
|            \consists "Staff_collecting_engraver"
|            \override RehearsalMark #'direction = #DOWN
|          }
|  

With regard to the po files: they look like they match the current code
base better.  However, I believe they are supposed to be generated
through some automatic process or whatever, so I am queasy about
updating them through a merge.

Suggestions how to deal with them?  Merge or not?

-- 
David Kastrup